Added boltkit test to verify that the driver actually works with the routing context in uri

Author: Zhen

neo4j/v1/direct.py

@@ -56,6 +56,8 @@ def __init__(self, uri, **config):
         # will carry out DNS resolution, leading to the possibility that
         # the connection pool may contain multiple IP address keys, one for
         # an old address and one for a new address.
+        if SocketAddress.parse_routing_context(uri):
+            raise ValueError("Routing parameters are not supported with scheme 'bolt'. Given URI: '" + uri + "'.")
         self.address = SocketAddress.from_uri(uri, DEFAULT_PORT)
         self.security_plan = security_plan = SecurityPlan.build(**config)
         self.encrypted = security_plan.encrypted

neo4j/v1/routing.py

@@ -333,7 +333,7 @@ def __init__(self, uri, **config):
         def connector(a):
             return connect(a, security_plan.ssl_context, **config)
 
-        pool = RoutingConnectionPool(connector, initial_address, routing_context *resolve(initial_address))
+        pool = RoutingConnectionPool(connector, initial_address, routing_context, *resolve(initial_address))
         try:
             pool.update_routing_table()
         except:

test/stub/scripts/get_routing_table.script

@@ -0,0 +1,9 @@
+!: AUTO INIT
+!: AUTO RESET
+
+S: SUCCESS {"server": "Neo4j/3.2.2"}
+C: RUN "CALL dbms.cluster.routing.getRoutingTable({context})" {"context": {}}
+   PULL_ALL
+S: SUCCESS {"fields": ["ttl", "servers"]}
+   RECORD [9223372036854775807, [{"addresses": ["127.0.0.1:9001"],"role": "WRITE"}, {"addresses": ["127.0.0.1:9002"], "role": "READ"},{"addresses": ["127.0.0.1:9001", "127.0.0.1:9002"], "role": "ROUTE"}]]
+   SUCCESS {}

test/stub/scripts/get_routing_table_with_context.script

@@ -0,0 +1,9 @@
+!: AUTO INIT
+!: AUTO RESET
+
+S: SUCCESS {"server": "Neo4j/3.2.3"}
+C: RUN "CALL dbms.cluster.routing.getRoutingTable({context})" {"context": {"name": "molly", "age": "1"}}
+   PULL_ALL
+S: SUCCESS {"fields": ["ttl", "servers"]}
+   RECORD [9223372036854775807, [{"addresses": ["127.0.0.1:9001"],"role": "WRITE"}, {"addresses": ["127.0.0.1:9002"], "role": "READ"},{"addresses": ["127.0.0.1:9001", "127.0.0.1:9002"], "role": "ROUTE"}]]
+   SUCCESS {}

test/stub/test_directdriver.py

@@ -48,3 +48,9 @@ def test_direct_disconnect_on_pull_all(self):
                 with self.assertRaises(ServiceUnavailable):
                     with driver.session() as session:
                         session.run("RETURN $x", {"x": 1}).consume()
+
+    def test_direct_should_reject_routing_context(self):
+            uri = "bolt://127.0.0.1:9001/?name=molly&age=1"
+            with self.assertRaises(ValueError):
+                GraphDatabase.driver(uri, auth=self.auth_token, encrypted=False)
+

test/stub/test_routing.py

@@ -131,6 +131,19 @@ def test_should_fail_if_database_error(self):
                 with self.assertRaises(ServiceUnavailable):
                     _ = pool.fetch_routing_info(address)
 
+    def test_should_call_get_routing_tables_with_context(self):
+        with StubCluster({9001: "get_routing_table_with_context.script"}):
+            address = ("127.0.0.1", 9001)
+            routing_context = {"name": "molly", "age": "1"}
+            with RoutingConnectionPool(connector, UNREACHABLE_ADDRESS, routing_context) as pool:
+                pool.fetch_routing_info(address)
+
+    def test_should_call_get_routing_tables(self):
+        with StubCluster({9001: "get_routing_table.script"}):
+            address = ("127.0.0.1", 9001)
+            with RoutingConnectionPool(connector, UNREACHABLE_ADDRESS, {}) as pool:
+                pool.fetch_routing_info(address)
+
 
 class RoutingConnectionPoolFetchRoutingTableTestCase(StubTestCase):
     def test_should_get_table_from_router(self):

test/stub/test_routingdriver.py

@@ -179,3 +179,23 @@ def test_two_sessions_can_share_a_connection(self):
 
                 session_2.close()
                 session_1.close()
+
+    def test_should_call_get_routing_table_procedure(self):
+        with StubCluster({9001: "get_routing_table.script", 9002: "return_1.script"}):
+            uri = "bolt+routing://127.0.0.1:9001"
+            with GraphDatabase.driver(uri, auth=self.auth_token, encrypted=False) as driver:
+                with driver.session(READ_ACCESS) as session:
+                    result = session.run("RETURN $x", {"x": 1})
+                    for record in result:
+                        assert record["x"] == 1
+                    assert result.summary().server.address == ('127.0.0.1', 9002)
+
+    def test_should_call_get_routing_table_with_context(self):
+        with StubCluster({9001: "get_routing_table_with_context.script", 9002: "return_1.script"}):
+            uri = "bolt+routing://127.0.0.1:9001/?name=molly&age=1"
+            with GraphDatabase.driver(uri, auth=self.auth_token, encrypted=False) as driver:
+                with driver.session(READ_ACCESS) as session:
+                    result = session.run("RETURN $x", {"x": 1})
+                    for record in result:
+                        assert record["x"] == 1
+                    assert result.summary().server.address == ('127.0.0.1', 9002)

test/unit/test_routing.py

@@ -229,5 +229,5 @@ class RoutingConnectionPoolConstructionTestCase(TestCase):
     def test_should_populate_initial_router(self):
         initial_router = ("127.0.0.1", 9001)
         router = ("127.0.0.1", 9002)
-        with RoutingConnectionPool(connector, initial_router, router) as pool:
+        with RoutingConnectionPool(connector, initial_router, {}, router) as pool:
             assert pool.routing_table.routers == {("127.0.0.1", 9002)}