Merge branch '4.4' into impersonation

Author: robsdedude

neo4j/addressing.py

@@ -138,6 +138,10 @@ def host(self):
     def port(self):
         return self[1]
 
+    @property
+    def unresolved(self):
+        return self
+
     @classmethod
     def _dns_resolve(cls, address, family=0):
         """ Regular DNS resolver. Takes an address object and optional
@@ -226,6 +230,10 @@ class ResolvedAddress(Address):
     def host_name(self):
         return self._host_name
 
+    @property
+    def unresolved(self):
+        return super().__new__(Address, (self._host_name, *self[1:]))
+
     def resolve(self, family=0, resolver=None):
         return [self]
 

neo4j/io/__init__.py

@@ -1112,7 +1112,7 @@ def update_routing_table(self, *, database, imp_user, bookmarks,
     def update_connection_pool(self, *, database):
         servers = self.get_or_create_routing_table(database).servers()
         for address in list(self.connections):
-            if address not in servers:
+            if address.unresolved not in servers:
                 super(Neo4jPool, self).deactivate(address)
 
     def ensure_routing_table_is_fresh(self, *, access_mode, database, imp_user,

testkitbackend/test_config.json

@@ -1,29 +1,5 @@
 {
   "skips": {
-    "stub.routing.test_routing_v4x1.RoutingV4x1.test_should_retry_write_until_success_with_leader_change_using_tx_function":
-      "Driver closes connection to router if DNS resolved name not in routing table",
-    "stub.routing.test_routing_v3.RoutingV3.test_should_retry_write_until_success_with_leader_change_using_tx_function":
-      "Driver closes connection to router if DNS resolved name not in routing table",
-    "stub.routing.test_routing_v4x3.RoutingV4x3.test_should_retry_write_until_success_with_leader_change_using_tx_function":
-      "Driver closes connection to router if DNS resolved name not in routing table",
-    "stub.routing.test_routing_v4x4.RoutingV4x4.test_should_retry_write_until_success_with_leader_change_using_tx_function":
-      "Driver closes connection to router if DNS resolved name not in routing table",
-    "stub.routing.test_routing_v4x1.RoutingV4x1.test_should_retry_write_until_success_with_leader_change_on_run_using_tx_function":
-      "Driver closes connection to router if DNS resolved name not in routing table",
-    "stub.routing.test_routing_v3.RoutingV3.test_should_retry_write_until_success_with_leader_change_on_run_using_tx_function":
-      "Driver closes connection to router if DNS resolved name not in routing table",
-    "stub.routing.test_routing_v4x3.RoutingV4x3.test_should_retry_write_until_success_with_leader_change_on_run_using_tx_function":
-      "Driver closes connection to router if DNS resolved name not in routing table",
-    "stub.routing.test_routing_v4x4.RoutingV4x4.test_should_retry_write_until_success_with_leader_change_on_run_using_tx_function":
-      "Driver closes connection to router if DNS resolved name not in routing table",
-    "stub.routing.test_routing_v4x1.RoutingV4x1.test_should_retry_write_until_success_with_leader_shutdown_during_tx_using_tx_function":
-      "Driver closes connection to router if DNS resolved name not in routing table",
-    "stub.routing.test_routing_v3.RoutingV3.test_should_retry_write_until_success_with_leader_shutdown_during_tx_using_tx_function":
-      "Driver closes connection to router if DNS resolved name not in routing table",
-    "stub.routing.test_routing_v4x3.RoutingV4x3.test_should_retry_write_until_success_with_leader_shutdown_during_tx_using_tx_function":
-      "Driver closes connection to router if DNS resolved name not in routing table",
-    "stub.routing.test_routing_v4x4.RoutingV4x4.test_should_retry_write_until_success_with_leader_shutdown_during_tx_using_tx_function":
-      "Driver closes connection to router if DNS resolved name not in routing table",
     "stub.routing.test_routing_v4x1.RoutingV4x1.test_should_successfully_acquire_rt_when_router_ip_changes":
       "Test makes assumptions about how verify_connectivity is implemented",
     "stub.routing.test_routing_v3.RoutingV3.test_should_successfully_acquire_rt_when_router_ip_changes":

tests/unit/test_addressing.py

@@ -230,15 +230,29 @@ def test_address_resolve_with_unresolvable_address(test_input, expected):
 
 def test_address_resolve_with_custom_resolver():
     # python -m pytest tests/unit/test_addressing.py -s -k test_address_resolve_with_custom_resolver
-    custom_resolver = lambda a: [("127.0.0.1", 7687), ("localhost", 1234)]
+    custom_resolver = lambda _: [("127.0.0.1", 7687), ("localhost", 1234)]
 
     address = Address(("127.0.0.1", 7687))
     resolved = address.resolve(family=AF_INET, resolver=custom_resolver)
     assert isinstance(resolved, Address) is False
     assert isinstance(resolved, list) is True
-    if len(resolved) == 2:
-        # IPv4 only
-        assert resolved[0] == IPv4Address(('127.0.0.1', 7687))
-        assert resolved[1] == IPv4Address(('127.0.0.1', 1234))
-    else:
-        assert False
+    assert len(resolved) == 2  # IPv4 only
+    assert resolved[0] == IPv4Address(('127.0.0.1', 7687))
+    assert resolved[1] == IPv4Address(('127.0.0.1', 1234))
+
+
+def test_address_unresolve():
+    # python -m pytest tests/unit/test_addressing.py -s -k test_address_unresolve
+    custom_resolved = [("127.0.0.1", 7687), ("localhost", 4321)]
+    custom_resolver = lambda _: custom_resolved
+
+    address = Address(("foobar", 1234))
+    unresolved = address.unresolved
+    assert address.__class__ == unresolved.__class__
+    assert address == unresolved
+    resolved = address.resolve(family=AF_INET, resolver=custom_resolver)
+    custom_resolved = sorted(Address(a) for a in custom_resolved)
+    unresolved = sorted(a.unresolved for a in resolved)
+    assert custom_resolved == unresolved
+    assert (list(map(lambda a: a.__class__, custom_resolved))
+            == list(map(lambda a: a.__class__, unresolved)))