test(retryable-writes): fix failpoint setup and teardown

NODE-1105

Author: mbroadst

test/functional/retryable_writes_tests.js

@@ -1,15 +1,17 @@
 'use strict';
 
-var fs = require('fs'),
+const fs = require('fs'),
   path = require('path'),
   expect = require('chai').expect;
 
 let testContext = {};
 describe('Retryable Writes', function() {
   before(function() {
-    var configuration = this.configuration;
-    var MongoClient = configuration.require.MongoClient;
-    return MongoClient.connect(configuration.url()).then(function(client) {
+    const configuration = this.configuration;
+    const MongoClient = configuration.require.MongoClient;
+    const url = `${configuration.url()}&retryWrites=true`;
+
+    return MongoClient.connect(url, { minSize: 1 }).then(function(client) {
       testContext.client = client;
       testContext.db = client.db(configuration.db);
     });
@@ -30,32 +32,32 @@ describe('Retryable Writes', function() {
 
       describe(methodName, function() {
         scenario.tests.forEach(test => {
-          beforeEach(function() {
-            if (test.failpoint) {
-              return testContext.db.command({
-                configureFailPoint: 'onPrimaryTransactionalWrite',
-                mode: test.failpoint.mode,
-                data: test.failpoint.data
-              });
-            }
-          });
-
-          afterEach(function() {
-            if (test.failpoint) {
-              return testContext.db.command({
-                configureFailPoint: 'onPrimaryTransactionalWrite',
-                mode: 'off'
-              });
-            }
-          });
-
           it(test.description, {
             metadata: {
               requires: { topology: ['single'], mongodb: '>=' + scenario.minServerVersion }
             },
 
             test: function() {
-              return executeScenarioTest(scenario, test, this.configuration, testContext);
+              let setupPromise;
+              if (test.failPoint) {
+                const command = { configureFailPoint: 'onPrimaryTransactionalWrite' };
+                if (test.failPoint.mode) command.mode = test.failPoint.mode;
+                if (test.failPoint.data) command.data = test.failPoint.data;
+                return testContext.db.executeDbAdminCommand(command);
+              } else {
+                setupPromise = Promise.resolve();
+              }
+
+              return setupPromise
+                .then(() => executeScenarioTest(scenario, test, this.configuration, testContext))
+                .then(() => {
+                  if (test.failPoint) {
+                    return testContext.db.executeDbAdminCommand({
+                      configureFailPoint: 'onPrimaryTransactionalWrite',
+                      mode: 'off'
+                    });
+                  }
+                });
             }
           });
         });
@@ -70,7 +72,7 @@ const convertBulkWriteOperation = op => {
 };
 
 function executeScenarioTest(scenario, test, configuration, context) {
-  var collection = context.db.collection(
+  const collection = context.db.collection(
     'retryable_writes_test_' + scenario.name + '_' + test.operation.name
   );
 
@@ -104,7 +106,10 @@ function executeScenarioTest(scenario, test, configuration, context) {
 
       let result = collection[test.operation.name].apply(collection, args);
       if (test.outcome.error) {
-        result = result.then(() => expect(false).to.be.true).catch(err => expect(err).to.exist);
+        result = result.then(() => expect(false).to.be.true).catch(err => {
+          expect(err).to.exist;
+          expect(err.message).to.not.match(/expected false to be true/);
+        });
       } else if (test.outcome.result) {
         result = result.then(r => expect(r).to.deep.include(test.outcome.result));
       }
@@ -116,7 +121,7 @@ function executeScenarioTest(scenario, test, configuration, context) {
         return collection
           .find({})
           .toArray()
-          .then(function(collectionResults) {
+          .then(collectionResults => {
             expect(collectionResults).to.eql(test.outcome.collection.data);
           });
       }