Test fixes

Author: technige

neo4j/v1/compat/collections.py

@@ -18,6 +18,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+from __future__ import absolute_import
 
 try:
     from collections.abc import MutableSet

neo4j/v1/session.py

@@ -220,9 +220,10 @@ def connector(a):
         try:
             pool.update_routing_table()
         except:
-            self.close()
+            pool.close()
             raise
-        Driver.__init__(self, pool)
+        else:
+            Driver.__init__(self, pool)
 
     def session(self, access_mode=None):
         if access_mode == READ_ACCESS:

runtests.sh

@@ -1,13 +1,14 @@
 #!/usr/bin/env bash
 
 RUN=$(dirname "$0")/test/run/
+VERSIONS="3.0.7:3.1.0-M13-beta3"
 
 # Export DIST_HOST=localhost if local web server hosts server packages
 if [ -z $1 ]
 then
     # Full test (with coverage)
-    neotest -e 3.0.7:3.1.0-M13-beta3 ${RUN} coverage run --source neo4j -m unittest discover -vs test && coverage report --show-missing
+    neotest -e ${VERSIONS} ${RUN} coverage run --source neo4j -m unittest discover -vs test && coverage report --show-missing
 else
     # Partial test
-    neotest -e 3.0.7:3.1.0-M13-beta3 ${RUN} coverage run --source neo4j -m unittest -v $1 && coverage report --show-missing
+    neotest -e ${VERSIONS} ${RUN} coverage run --source neo4j -m unittest -v $1 && coverage report --show-missing
 fi

test/test_driver.py

@@ -131,13 +131,15 @@ def test_cannot_discover_servers_on_non_router(self):
         with StubCluster({9001: "non_router.script"}):
             uri = "bolt+routing://127.0.0.1:9001"
             with self.assertRaises(ServiceUnavailable):
-                _ = GraphDatabase.driver(uri, auth=AUTH_TOKEN, encrypted=False)
+                with GraphDatabase.driver(uri, auth=AUTH_TOKEN, encrypted=False):
+                    pass
 
     def test_cannot_discover_servers_on_silent_router(self):
         with StubCluster({9001: "silent_router.script"}):
             uri = "bolt+routing://127.0.0.1:9001"
             with self.assertRaises(ProtocolError):
-                _ = GraphDatabase.driver(uri, auth=AUTH_TOKEN, encrypted=False)
+                with GraphDatabase.driver(uri, auth=AUTH_TOKEN, encrypted=False):
+                    pass
 
     def test_should_discover_servers_on_driver_construction(self):
         with StubCluster({9001: "router.script"}):

test/util.py

@@ -23,7 +23,7 @@
 from os import getenv, remove, rename
 from os.path import isfile, dirname, join as path_join
 from socket import create_connection
-from subprocess import check_call, CalledProcessError
+from subprocess import call, check_call, CalledProcessError
 from threading import Thread
 from time import sleep
 from unittest import TestCase
@@ -94,23 +94,11 @@ def setUp(self):
             rename(self.known_hosts, self.known_hosts_backup)
 
     def tearDown(self):
-        self.await_all_servers()
         if isfile(self.known_hosts_backup):
             if isfile(self.known_hosts):
                 remove(self.known_hosts)
             rename(self.known_hosts_backup, self.known_hosts)
 
-    def start_stub_server(self, port, script):
-        server = StubServer(port, script)
-        server.start()
-        sleep(0.5)
-        self.servers.append(server)
-
-    def await_all_servers(self):
-        while self.servers:
-            server = self.servers.pop()
-            server.join()
-
 
 class StubServer(Thread):
 
@@ -129,10 +117,16 @@ def __init__(self, servers):
         self.servers = {port: StubServer(port, script) for port, script in dict(servers).items()}
 
     def __enter__(self):
+        self.start()
+
+    def __exit__(self, exc_type, exc_value, traceback):
+        self.wait()
+
+    def start(self):
         for port, server in self.servers.items():
             server.start()
         sleep(0.5)
 
-    def __exit__(self, exc_type, exc_value, traceback):
+    def wait(self):
         for port, server in self.servers.items():
             server.join()