Always close drivers in TCK tests

Author: lutovich

test/v1/tck/steps/authsteps.js

@@ -31,16 +31,19 @@ module.exports = function () {
   });
 
   this.Then(/^reading and writing to the database should be possible$/, function (callback) {
-    var session = this.driver.session();
-    session.run("CREATE (:label1)").then( function(  ) {
-        callback();
-    }).catch(function(err) {callback(new Error("Rejected Promise: " + err))});
+    var driver = this.driver;
+    var session = driver.session();
+    session.run('CREATE (:label1)').then(function () {
+      closeDriver(driver);
+      callback();
+    }).catch(function (err) {
+      closeDriver(driver);
+      callback(new Error('Rejected Promise: ' + err));
+    });
   });
 
   this.Given(/^a driver is configured with auth enabled and the wrong password is provided$/, function () {
-    if (this.driver) {
-      this.driver.close();
-    }
+    closeDriver(this.driver);
     this.driver = neo4j.driver("bolt://localhost", neo4j.auth.basic(sharedNeo4j.username, "wrong"));
     this.driver.session();
   });
@@ -49,14 +52,17 @@ module.exports = function () {
 
     var self = this;
     this.driver.onError = function (err) {
+      closeDriver(self.driver);
       self.err = err;
       callback();
     };
 
     var session = this.driver.session();
     session.run("CREATE (:label1)").then( function(  ) {
+      closeDriver(self.driver);
       callback(new Error("Should not be able to run session!"));
     }).catch( function(err) {
+      closeDriver(self.driver);
       callback();
     });
   });
@@ -76,4 +82,10 @@ module.exports = function () {
       throw new Error("Wrong error code. Expected: '" + expectedCode + "'. Got: '" + code + "'");
     }
   });
+
+  function closeDriver(driver) {
+    if (driver) {
+      driver.close();
+    }
+  }
 };

test/v1/tck/steps/erroreportingsteps.js

@@ -65,7 +65,14 @@ module.exports = function () {
   this.When(/^I set up a driver to an incorrect port$/, function (callback) {
     var self = this;
     var driver = neo4j.driver("bolt://localhost:7777", neo4j.auth.basic(sharedNeo4j.username, sharedNeo4j.password));
-    driver.onError = function (error) { self.error = error; callback()};
+    driver.onSuccess = function () {
+      driver.close();
+    };
+    driver.onError = function (error) {
+      driver.close();
+      self.error = error;
+      callback();
+    };
     driver.session().beginTransaction();
     setTimeout(callback, 1000);
   });

test/v1/tck/steps/tlssteps.js

@@ -20,11 +20,14 @@ module.exports = function () {
   });
 
   this.Then(/^sessions should simply work$/, {timeout: CALLBACK_TIMEOUT},  function (callback) {
-    var session = this.driver1.session();
+    var self = this;
+    var session = self.driver1.session();
     session.run("RETURN 1").then(function (result) {
       session.close();
+      _closeDrivers(self.driver1, self.driver2);
       callback();
     }).catch(function (error) {
+      _closeDrivers(self.driver1, self.driver2);
       console.log(error);
     });
   });
@@ -57,11 +60,13 @@ module.exports = function () {
     var self = this;
     session.run("RETURN 1")
       .then(function(res) {
+        _closeDrivers(self.driver1, self.driver2);
         console.log(res);
       })
       .catch(function (error) {
         self.error = error;
         session.close();
+        _closeDrivers(self.driver1, self.driver2);
         callback();
       });
   });
@@ -76,6 +81,9 @@ module.exports = function () {
       "and the driver will update the file with the new certificate. You can configure which file the driver should use " +
       "to store this information by setting `knownHosts` to another path in your driver configuration - " +
       "and you can disable encryption there as well using `encrypted:\"ENCRYPTION_OFF\"`.";
+
+    _closeDrivers(this.driver1, this.driver2);
+
     if (this.error.message !== expected) {
       callback(new Error("Given and expected results does not match: " + this.error.message + " Expected " + expected));
     } else {
@@ -101,6 +109,7 @@ module.exports = function () {
       var session2 = self.driver2.session();
       session2.run("RETURN 1").then(function (result) {
         session2.close();
+        _closeDrivers(self.driver1, self.driver2);
         callback();
       });
     });
@@ -157,6 +166,9 @@ module.exports = function () {
       "`neo4j.v1.driver(.., { trustedCertificates:['path/to/certificate.crt']}). This  is a security measure to protect " +
       "against man-in-the-middle attacks. If you are just trying  Neo4j out and are not concerned about encryption, " +
       "simply disable it using `encrypted=\"ENCRYPTION_OFF\"` in the driver options. Socket responded with: DEPTH_ZERO_SELF_SIGNED_CERT";
+
+    _closeDrivers(this.driver1, this.driver2);
+
     if (this.error.message !== expected) {
       callback(new Error("Given and expected results does not match: " + this.error.message + " Expected " + expected));
     } else {
@@ -171,4 +183,13 @@ module.exports = function () {
       encrypted: "ENCRYPTION_ON"
     });
   }
+
+  function _closeDrivers() {
+    for (var i = 0; i < arguments.length; i++) {
+      var driver = arguments[i];
+      if (driver) {
+        driver.close();
+      }
+    }
+  }
 };