tests: fixes to tests failing

* Related #14

[ci skip]

Author: tegefaulkes

tests/QUICClient.test.ts

@@ -10,7 +10,7 @@ import * as errors from '@/errors';
 import { promise } from '@/utils';
 import QUICSocket from '@/QUICSocket';
 import * as testsUtils from './utils';
-import { tlsConfigWithCaArb } from './tlsUtils';
+import { tlsConfigWithCaArb, tlsConfigWithCaGENOKPArb } from './tlsUtils';
 import { sleep } from './utils';
 import * as fixtures from './fixtures/certFixtures';
 
@@ -188,7 +188,7 @@ describe(QUICClient.name, () => {
     await expect(
       QUICClient.createQUICClient({
         host: '127.0.0.1' as Host,
-        port: 55555 as Port,
+        port: 56666 as Port,
         localHost: '127.0.0.1' as Host,
         crypto,
         logger: logger.getChild(QUICClient.name),
@@ -251,10 +251,9 @@ describe(QUICClient.name, () => {
       },
       { numRuns: 10 },
     );
-    // FIXME: randomly fails, likely due to test data selecting same cert
     testProp(
       'new connections use new config',
-      [tlsConfigWithCaArb, tlsConfigWithCaArb],
+      [tlsConfigWithCaGENOKPArb, tlsConfigWithCaGENOKPArb],
       async (tlsConfigProm1, tlsConfigProm2) => {
         const tlsConfig1 = await tlsConfigProm1;
         const tlsConfig2 = await tlsConfigProm2;
@@ -599,7 +598,7 @@ describe(QUICClient.name, () => {
       const result = await server.initHolePunch(
         {
           host: '127.0.0.1' as Host,
-          port: 55555 as Port,
+          port: 52222 as Port,
         },
         2000,
       );
@@ -1385,7 +1384,7 @@ describe(QUICClient.name, () => {
     test('Keep alive does not prevent connection timeout', async () => {
       const clientProm = QUICClient.createQUICClient({
         host: '::ffff:127.0.0.1' as Host,
-        port: 55555 as Port,
+        port: 54444 as Port,
         localHost: '::' as Host,
         crypto,
         logger: logger.getChild(QUICClient.name),

tests/QUICSocket.test.ts

@@ -97,7 +97,7 @@ describe(QUICSocket.name, () => {
     dualStackSocketClose = utils
       .promisify(dualStackSocket.close)
       .bind(dualStackSocket);
-    await ipv4SocketBind(55555, '127.0.0.1');
+    await ipv4SocketBind(57777, '127.0.0.1');
     await ipv6SocketBind(0, '::1');
     await dualStackSocketBind(0, '::');
     ipv4SocketPort = ipv4Socket.address().port;

tests/QUICStream.test.ts

@@ -229,7 +229,7 @@ describe(QUICStream.name, () => {
       );
       await server.start({
         host: '127.0.0.1' as Host,
-        port: 55555 as Port,
+        port: 58888 as Port,
       });
       const client = await QUICClient.createQUICClient({
         host: '::ffff:127.0.0.1' as Host,
@@ -322,7 +322,7 @@ describe(QUICStream.name, () => {
       );
       await server.start({
         host: '127.0.0.1' as Host,
-        port: 55555 as Port,
+        port: 59999 as Port,
       });
       const client = await QUICClient.createQUICClient({
         host: '::ffff:127.0.0.1' as Host,
@@ -423,7 +423,7 @@ describe(QUICStream.name, () => {
       );
       await server.start({
         host: '127.0.0.1' as Host,
-        port: 55555 as Port,
+        port: 60000 as Port,
       });
       const client = await QUICClient.createQUICClient({
         host: '::ffff:127.0.0.1' as Host,

tests/concurrency.test.ts

@@ -28,6 +28,7 @@ describe('Concurrency tests', () => {
 
   // Tracking resources
   let sockets: Array<QUICSocket>;
+  const socketPort1 = 50001 as Port;
 
   const reasonToCode = (type: 'recv' | 'send', reason?: any) => {
     logger.error(type, reason);
@@ -172,7 +173,7 @@ describe('Concurrency tests', () => {
         await sleep(100);
         await server.start({
           host: '127.0.0.1' as Host,
-          port: 55555 as Port,
+          port: socketPort1,
         });
         try {
           await cleanUpHoldProm.p;
@@ -196,7 +197,7 @@ describe('Concurrency tests', () => {
             logger.info('STARTING CLIENT');
             return QUICClient.createQUICClient({
               host: '::ffff:127.0.0.1' as Host,
-              port: 55555 as Port,
+              port: socketPort1,
               localHost: '::' as Host,
               crypto,
               logger: logger.getChild(QUICClient.name),
@@ -288,7 +289,7 @@ describe('Concurrency tests', () => {
         await sleep(100);
         await server.start({
           host: '127.0.0.1' as Host,
-          port: 55556 as Port,
+          port: socketPort1,
         });
         try {
           await cleanUpHoldProm.p;
@@ -320,7 +321,7 @@ describe('Concurrency tests', () => {
             logger.info('STARTING CLIENT');
             return QUICClient.createQUICClient({
               host: '127.0.0.1' as Host,
-              port: 55556 as Port,
+              port: socketPort1,
               socket,
               crypto,
               logger: logger.getChild(QUICClient.name),