test(NODE-3688): sync spec tests

Author: durran

src/cmap/connect.ts

@@ -10,6 +10,7 @@ import { LEGACY_HELLO_COMMAND } from '../constants';
 import {
   AnyError,
   MongoCompatibilityError,
+  MongoHandshakeError,
   MongoInvalidArgumentError,
   MongoNetworkError,
   MongoNetworkTimeoutError,
@@ -134,7 +135,7 @@ function performInitialHandshake(
     const start = new Date().getTime();
     conn.command(ns('admin.$cmd'), handshakeDoc, handshakeOptions, (err, response) => {
       if (err) {
-        callback(err);
+        callback(new MongoHandshakeError(err.message));
         return;
       }
 

src/error.ts

@@ -197,6 +197,21 @@ export class MongoDriverError extends MongoError {
   }
 }
 
+/**
+ * An error during the handshake.
+ *
+ * @public
+ * @category Error
+ */
+export class MongoHandshakeError extends MongoError {
+  constructor(message: string) {
+    super(message);
+  }
+
+  get name(): string {
+    return 'MongoHandshakeError';
+  }
+}
 /**
  * An error generated when the driver API is used incorrectly
  *
@@ -738,7 +753,8 @@ export function isRetryableError(error: MongoError): boolean {
     (typeof error.code === 'number' && RETRYABLE_ERROR_CODES.has(error.code!)) ||
     error instanceof MongoNetworkError ||
     !!error.message.match(new RegExp(LEGACY_NOT_WRITABLE_PRIMARY_ERROR_MESSAGE)) ||
-    !!error.message.match(new RegExp(NODE_IS_RECOVERING_ERROR_MESSAGE))
+    !!error.message.match(new RegExp(NODE_IS_RECOVERING_ERROR_MESSAGE)) ||
+    error instanceof MongoHandshakeError
   );
 }
 

test/integration/retryable-reads/retryable_reads.spec.test.js

@@ -1,11 +1,13 @@
 'use strict';
 
+const path = require('path');
 const { TestRunnerContext, generateTopologyTests } = require('../../tools/spec-runner');
 const { loadSpecTests } = require('../../spec');
+const { runUnifiedSuite } = require('../../tools/unified-spec-runner/runner');
 
-describe('Retryable Reads', function () {
+describe('Retryable Reads (legacy)', function () {
   const testContext = new TestRunnerContext();
-  const testSuites = loadSpecTests('retryable-reads');
+  const testSuites = loadSpecTests(path.join('retryable-reads', 'legacy'));
 
   after(() => testContext.teardown());
   before(function () {
@@ -28,3 +30,7 @@ describe('Retryable Reads', function () {
     );
   });
 });
+
+describe('Retryable Reads (unified)', function () {
+  runUnifiedSuite(loadSpecTests(path.join('retryable-reads', 'unified')));
+});