Tighter testing

Author: technige

neo4j/v1/session.py

@@ -165,9 +165,6 @@ class Driver(object):
     def __init__(self, connector):
         self.pool = ConnectionPool(connector)
 
-    def __del__(self):
-        self.close()
-
     def __enter__(self):
         return self
 
@@ -284,8 +281,12 @@ def __init__(self, address, **config):
             # scenario right now
             raise ValueError("TRUST_ON_FIRST_USE is not compatible with routing")
         Driver.__init__(self, lambda a: connect(a, security_plan.ssl_context, **config))
-        self.router = ConnectionRouter(self.pool, address)
-        self.router.discover()
+        try:
+            self.router = ConnectionRouter(self.pool, address)
+            self.router.discover()
+        except:
+            self.close()
+            raise
 
     def session(self, access_mode=None):
         if access_mode == READ_ACCESS:

test/test_connection.py

@@ -105,6 +105,9 @@ class RouterTestCase(ServerTestCase):
     def setUp(self):
         self.pool = ConnectionPool(lambda a: connect(a, auth=basic_auth("neo4j", "password")))
 
+    def tearDown(self):
+        self.pool.close()
+
     def test_router_is_initially_stale(self):
         router = ConnectionRouter(self.pool, ("127.0.0.1", 7687))
         assert router.stale()

test/test_driver.py

@@ -71,6 +71,9 @@ def test_fail_nicely_when_connecting_to_http_port(self):
 
 class DirectDriverTestCase(ServerTestCase):
 
+    def tearDown(self):
+        self.await_all_servers()
+
     def test_direct_disconnect_on_run(self):
         self.start_stub_server(9001, "disconnect_on_run.script")
         uri = "bolt://127.0.0.1:9001"
@@ -96,6 +99,9 @@ def test_direct_disconnect_on_pull_all(self):
 
 class RoutingDriverTestCase(ServerTestCase):
 
+    def tearDown(self):
+        self.await_all_servers()
+
     def test_cannot_discover_servers_on_non_router(self):
         self.start_stub_server(9001, "non_router.script")
         uri = "bolt+routing://127.0.0.1:9001"

test/util.py

@@ -85,6 +85,7 @@ class ServerTestCase(TestCase):
 
     known_hosts = KNOWN_HOSTS
     known_hosts_backup = known_hosts + ".backup"
+    servers = []
 
     def setUp(self):
         if isfile(self.known_hosts):
@@ -99,8 +100,15 @@ def tearDown(self):
             rename(self.known_hosts_backup, self.known_hosts)
 
     def start_stub_server(self, port, script):
-        StubServer(port, script).start()
+        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):