Skip to content

Commit

Permalink
test: remove uneeded agent keypair in fixtures/
Browse files Browse the repository at this point in the history
PR-URL: #27962
Reviewed-By: Sam Roberts <vieuxtech@gmail.com>
Reviewed-By: Ujjwal Sharma <usharma1998@gmail.com>
Reviewed-By: Rich Trott <rtrott@gmail.com>
  • Loading branch information
reasonablytall authored and BridgeAR committed Jun 17, 2019
1 parent a0d2862 commit 328b2d0
Show file tree
Hide file tree
Showing 7 changed files with 11 additions and 59 deletions.
21 changes: 0 additions & 21 deletions test/fixtures/agent.crt

This file was deleted.

27 changes: 0 additions & 27 deletions test/fixtures/agent.key

This file was deleted.

4 changes: 2 additions & 2 deletions test/parallel/test-tls-securepair-server.js
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@ const net = require('net');
const spawn = require('child_process').spawn;
const fixtures = require('../common/fixtures');

const key = fixtures.readSync('agent.key').toString();
const cert = fixtures.readSync('agent.crt').toString();
const key = fixtures.readKey('rsa_private.pem');
const cert = fixtures.readKey('rsa_cert.crt');

function log(a) {
console.error(`***server*** ${a}`);
Expand Down
8 changes: 4 additions & 4 deletions test/parallel/test-tls-session-cache.js
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,8 @@ doTest({ tickets: false }, function() {
});

function doTest(testOptions, callback) {
const key = fixtures.readSync('agent.key');
const cert = fixtures.readSync('agent.crt');
const key = fixtures.readKey('rsa_private.pem');
const cert = fixtures.readKey('rsa_cert.crt');
const options = {
key,
cert,
Expand Down Expand Up @@ -101,8 +101,8 @@ function doTest(testOptions, callback) {
'-tls1',
'-connect', `localhost:${this.address().port}`,
'-servername', 'ohgod',
'-key', fixtures.path('agent.key'),
'-cert', fixtures.path('agent.crt'),
'-key', fixtures.path('keys/rsa_private.pem'),
'-cert', fixtures.path('keys/rsa_cert.crt'),
'-reconnect'
].concat(testOptions.tickets ? [] : '-no_ticket');

Expand Down
4 changes: 2 additions & 2 deletions test/parallel/test-tls-ticket-cluster.js
Original file line number Diff line number Diff line change
Expand Up @@ -94,8 +94,8 @@ if (cluster.isMaster) {
return;
}

const key = fixtures.readSync('agent.key');
const cert = fixtures.readSync('agent.crt');
const key = fixtures.readKey('rsa_private.pem');
const cert = fixtures.readKey('rsa_cert.crt');

const options = { key, cert };

Expand Down
2 changes: 1 addition & 1 deletion test/sequential/test-tls-securepair-client.js
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ test1();

// simple/test-tls-securepair-client
function test1() {
test('agent.key', 'agent.crt', null, test2);
test('keys/rsa_private.pem', 'keys/rsa_cert.crt', null, test2);
}

// simple/test-tls-ext-key-usage
Expand Down
4 changes: 2 additions & 2 deletions test/sequential/test-tls-session-timeout.js
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,8 @@ function doTest() {

const SESSION_TIMEOUT = 1;

const key = fixtures.readSync('agent.key');
const cert = fixtures.readSync('agent.crt');
const key = fixtures.readKey('rsa_private.pem');
const cert = fixtures.readKey('rsa_cert.crt');
const options = {
key: key,
cert: cert,
Expand Down

0 comments on commit 328b2d0

Please sign in to comment.