test: remove uneeded agent keypair in fixtures/

PR-URL: #27962 Reviewed-By: Sam Roberts <vieuxtech@gmail.com> Reviewed-By: Ujjwal Sharma <usharma1998@gmail.com> Reviewed-By: Rich Trott <rtrott@gmail.com>
nodejs · Jun 17, 2019 · 328b2d0 · 328b2d0
1 parent a0d2862
commit 328b2d0
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 59 deletions.
diff --git a/test/fixtures/agent.crt b/test/fixtures/agent.crt
diff --git a/test/fixtures/agent.key b/test/fixtures/agent.key
diff --git a/test/parallel/test-tls-securepair-server.js b/test/parallel/test-tls-securepair-server.js
@@ -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}`);

diff --git a/test/parallel/test-tls-session-cache.js b/test/parallel/test-tls-session-cache.js
@@ -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,
@@ -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');
 

diff --git a/test/parallel/test-tls-ticket-cluster.js b/test/parallel/test-tls-ticket-cluster.js
@@ -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 };
 

diff --git a/test/sequential/test-tls-securepair-client.js b/test/sequential/test-tls-securepair-client.js
@@ -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

diff --git a/test/sequential/test-tls-session-timeout.js b/test/sequential/test-tls-session-timeout.js
@@ -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,