test(NODE-3288): sync command-monitoring spec tests to 3.6 (#2838)

* refactor: rename apm spec directory to command-monitoring

* Sync redacted commands spec tests

* Skip failing spec tests

* Move legacy command-monitoring spec tests into their own folder

* Skip unrelated failing tests

Author: dariakp

test/functional/apm.test.js

@@ -9,6 +9,7 @@ const ignoreNsNotFound = shared.ignoreNsNotFound;
 const loadSpecTests = require('../spec').loadSpecTests;
 const chai = require('chai');
 const expect = chai.expect;
+const runUnifiedTest = require('./unified-spec-runner/runner').runUnifiedTest;
 
 describe('APM', function() {
   before(function() {
@@ -879,7 +880,7 @@ describe('APM', function() {
     }
   });
 
-  describe('spec tests', function() {
+  describe('command monitoring spec tests', function() {
     before(function() {
       return setupDatabase(this.configuration);
     });
@@ -1087,7 +1088,7 @@ describe('APM', function() {
         });
     }
 
-    loadSpecTests('apm').forEach(scenario => {
+    loadSpecTests('command-monitoring/legacy').forEach(scenario => {
       describe(scenario.name, function() {
         scenario.tests.forEach(test => {
           const requirements = { topology: ['single', 'replicaset', 'sharded'] };
@@ -1106,6 +1107,13 @@ describe('APM', function() {
           it(test.description, {
             metadata: { requires: requirements },
             test: function() {
+              // NODE-3308
+              if (
+                test.description ===
+                'A successful find event with a getmore and the server kills the cursor'
+              ) {
+                this.skip();
+              }
               const client = this.configuration.newClient({}, { monitorCommands: true });
               return client.connect().then(client => {
                 expect(client).to.exist;
@@ -1117,4 +1125,30 @@ describe('APM', function() {
       });
     });
   });
+
+  describe('command monitoring unified spec tests', () => {
+    for (const loadedSpec of loadSpecTests('command-monitoring/unified')) {
+      expect(loadedSpec).to.include.all.keys(['description', 'tests']);
+      // TODO: NODE-3356 unskip redaction tests
+      const testsToSkip =
+        loadedSpec.description === 'redacted-commands'
+          ? loadedSpec.tests
+              .map(test => test.description)
+              .filter(
+                description =>
+                  description !== 'hello without speculative authenticate is not redacted'
+              )
+          : [];
+      context(String(loadedSpec.description), function() {
+        for (const test of loadedSpec.tests) {
+          it(String(test.description), {
+            metadata: { sessions: { skipLeakTests: true } },
+            test: async function() {
+              await runUnifiedTest(this, loadedSpec, test, testsToSkip);
+            }
+          });
+        }
+      });
+    }
+  });
 });

test/functional/unified-spec-runner/unified-runner.test.js

@@ -24,7 +24,9 @@ const SKIPPED_TESTS = [
   // These two tests need to run against multiple mongoses
   'Dirty explicit session is discarded',
   // Will be implemented as part of NODE-2034
-  'Client side error in command starting transaction'
+  'Client side error in command starting transaction',
+  // NODE-3308
+  'A successful find event with a getmore and the server kills the cursor'
 ];
 
 describe('Unified test format runner', function unifiedTestRunner() {

test/spec/apm/README.rst renamed to test/spec/command-monitoring/README.rst

@@ -12,6 +12,9 @@ Command Monitoring
 Testing
 =======
 
+Tests in ``unified`` are implemented in the `Unified Test Format <../../unified-test-format/unified-test-format.rst>`__ and require
+schema version 1.0. Tests in ``legacy`` should be run as described below.
+
 Tests are provided in YML and JSON format to assert proper upconversion of commands.
 
 Data