Warnings overhaul

* Fix falsely emitted `DeprecationWarning` regarding
  `update_routing_table_timeout`.
* Treat warnings as errors during testing
* Changed tests to expect and catch warning or to avoid them.

Author: robsdedude

neo4j/io/__init__.py

@@ -277,18 +277,19 @@ def get_handshake(cls):
         return b"".join(version.to_bytes() for version in offered_versions).ljust(16, b"\x00")
 
     @classmethod
-    def ping(cls, address, *, timeout=None, **config):
+    def ping(cls, address, *, timeout=None, pool_config=None):
         """ Attempt to establish a Bolt connection, returning the
         agreed Bolt protocol version if successful.
         """
-        config = PoolConfig.consume(config)
+        if pool_config is None:
+            pool_config = PoolConfig()
         try:
             s, protocol_version, handshake, data = BoltSocket.connect(
                 address,
                 timeout=timeout,
-                custom_resolver=config.resolver,
-                ssl_context=config.get_ssl_context(),
-                keep_alive=config.keep_alive,
+                custom_resolver=pool_config.resolver,
+                ssl_context=pool_config.get_ssl_context(),
+                keep_alive=pool_config.keep_alive,
             )
         except (ServiceUnavailable, SessionExpired, BoltHandshakeError):
             return None
@@ -297,7 +298,8 @@ def ping(cls, address, *, timeout=None, **config):
             return protocol_version
 
     @classmethod
-    def open(cls, address, *, auth=None, timeout=None, routing_context=None, **pool_config):
+    def open(cls, address, *, auth=None, timeout=None, routing_context=None,
+             pool_config=None):
         """ Open a new Bolt connection to a given server address.
 
         :param address:
@@ -316,7 +318,8 @@ def time_remaining():
             return t if t > 0 else 0
 
         t0 = perf_counter()
-        pool_config = PoolConfig.consume(pool_config)
+        if pool_config is None:
+            pool_config = PoolConfig()
 
         socket_connection_timeout = pool_config.connection_timeout
         if socket_connection_timeout is None:
@@ -906,7 +909,7 @@ def open(cls, address, *, auth, pool_config, workspace_config):
         def opener(addr, timeout):
             return Bolt.open(
                 addr, auth=auth, timeout=timeout, routing_context=None,
-                **pool_config
+                pool_config=pool_config
             )
 
         pool = cls(opener, pool_config, workspace_config, address)
@@ -951,7 +954,8 @@ def open(cls, *addresses, auth, pool_config, workspace_config, routing_context=N
 
         def opener(addr, timeout):
             return Bolt.open(addr, auth=auth, timeout=timeout,
-                             routing_context=routing_context, **pool_config)
+                             routing_context=routing_context,
+                             pool_config=pool_config)
 
         pool = cls(opener, pool_config, workspace_config, address)
         return pool

neo4j/io/_socket.py

@@ -259,7 +259,7 @@ def _handshake(cls, s, resolved_address):
     def close_socket(cls, socket_):
         try:
             if isinstance(socket_, BoltSocket):
-                socket.close()
+                socket_.close()
             else:
                 socket_.shutdown(SHUT_RDWR)
                 socket_.close()

neo4j/time/__init__.py

@@ -482,7 +482,7 @@ def __mul__(self, other):
         :rtype: Duration
         """
         if isinstance(other, float):
-            deprecation_warn("Multiplication with float will be deprecated in "
+            deprecation_warn("Multiplication with float will be removed in "
                              "5.0.")
         if isinstance(other, (int, float)):
             return Duration(
@@ -1627,7 +1627,7 @@ def from_clock_time(cls, clock_time, epoch):
         ts = clock_time.seconds % 86400
         nanoseconds = int(NANO_SECONDS * ts + clock_time.nanoseconds)
         ticks = (epoch.time().ticks_ns + nanoseconds) % (86400 * NANO_SECONDS)
-        return Time.from_ticks_ns(ticks)
+        return cls.from_ticks_ns(ticks)
 
     @classmethod
     def __normalize_hour(cls, hour):
@@ -1657,8 +1657,8 @@ def __normalize_nanosecond(cls, hour, minute, second, nanosecond):
         # TODO 5.0: remove -----------------------------------------------------
         seconds, extra_ns = divmod(second, 1)
         if extra_ns:
-            deprecation_warn("Float support second will be removed in 5.0. "
-                             "Use `nanosecond` instead.")
+            deprecation_warn("Float support for `second` will be removed in "
+                             "5.0. Use `nanosecond` instead.")
         # ----------------------------------------------------------------------
         hour, minute, second = cls.__normalize_second(hour, minute, second)
         nanosecond = int(nanosecond
@@ -1753,7 +1753,7 @@ def nanosecond(self):
         return self.__nanosecond
 
     @property
-    @deprecated("hour_minute_second will be removed in 5.0. "
+    @deprecated("`hour_minute_second` will be removed in 5.0. "
                 "Use `hour_minute_second_nanosecond` instead.")
     def hour_minute_second(self):
         """The time as a tuple of (hour, minute, second).

testkit/backend.py

@@ -3,6 +3,6 @@
 
 if __name__ == "__main__":
     subprocess.check_call(
-        ["python", "-m", "testkitbackend"],
+        ["python", "-W", "error", "-m", "testkitbackend"],
         stdout=sys.stdout, stderr=sys.stderr
     )

testkitbackend/__main__.py

@@ -1,6 +1,10 @@
+import warnings
+
 from .server import Server
 
+
 if __name__ == "__main__":
+    warnings.simplefilter("error")
     server = Server(("0.0.0.0", 9876))
     while True:
         server.handle_request()

testkitbackend/requests.py

@@ -16,6 +16,7 @@
 # limitations under the License.
 import json
 from os import path
+import warnings
 
 import neo4j
 import testkitbackend.fromtestkit as fromtestkit
@@ -108,7 +109,9 @@ def NewDriver(backend, data):
 def VerifyConnectivity(backend, data):
     driver_id = data["driverId"]
     driver = backend.drivers[driver_id]
-    driver.verify_connectivity()
+    with warnings.catch_warnings():
+        warnings.simplefilter("ignore", category=neo4j.ExperimentalWarning)
+        driver.verify_connectivity()
     backend.send_response("Driver", {"id": driver_id})
 
 

tests/integration/conftest.py

@@ -43,14 +43,14 @@
 NEO4J_RELEASES = getenv("NEO4J_RELEASES", "snapshot-enterprise 3.5-enterprise").split()
 NEO4J_HOST = "localhost"
 NEO4J_PORTS = {
-    "bolt": 17601,
+    "bolt": 7687,
     "http": 17401,
     "https": 17301,
 }
-NEO4J_CORES = 3
-NEO4J_REPLICAS = 2
+NEO4J_CORES = 1
+NEO4J_REPLICAS = 0
 NEO4J_USER = "neo4j"
-NEO4J_PASSWORD = "password"
+NEO4J_PASSWORD = "pass"
 NEO4J_AUTH = (NEO4J_USER, NEO4J_PASSWORD)
 NEO4J_LOCK = RLock()
 NEO4J_SERVICE = None

tests/integration/examples/test_database_selection_example.py

@@ -42,12 +42,12 @@ class DatabaseSelectionExample:
     def __init__(self, uri, user, password):
         self.driver = GraphDatabase.driver(uri, auth=(user, password))
         with self.driver.session(database="system") as session:
-            session.run("DROP DATABASE example IF EXISTS").consume()
-            session.run("CREATE DATABASE example").consume()
+            session.run("DROP DATABASE example IF EXISTS WAIT").consume()
+            session.run("CREATE DATABASE example WAIT").consume()
 
     def close(self):
         with self.driver.session(database="system") as session:
-            session.run("DROP DATABASE example").consume()
+            session.run("DROP DATABASE example WAIT").consume()
         self.driver.close()
 
     def run_example_code(self):

tests/integration/test_temporal_types.py

@@ -89,7 +89,7 @@ def test_whole_second_time_input(cypher_eval):
 def test_nanosecond_resolution_time_input(cypher_eval):
     result = cypher_eval("CYPHER runtime=interpreted WITH $x AS x "
                          "RETURN [x.hour, x.minute, x.second, x.nanosecond]",
-                         x=Time(12, 34, 56.789012345))
+                         x=Time(12, 34, 56, 789012345))
     hour, minute, second, nanosecond = result
     assert hour == 12
     assert minute == 34
@@ -101,7 +101,7 @@ def test_time_with_numeric_time_offset_input(cypher_eval):
     result = cypher_eval("CYPHER runtime=interpreted WITH $x AS x "
                          "RETURN [x.hour, x.minute, x.second, "
                          "        x.nanosecond, x.offset]",
-                         x=Time(12, 34, 56.789012345, tzinfo=FixedOffset(90)))
+                         x=Time(12, 34, 56, 789012345, tzinfo=FixedOffset(90)))
     hour, minute, second, nanosecond, offset = result
     assert hour == 12
     assert minute == 34
@@ -150,7 +150,7 @@ def test_nanosecond_resolution_datetime_input(cypher_eval):
     result = cypher_eval("CYPHER runtime=interpreted WITH $x AS x "
                          "RETURN [x.year, x.month, x.day, "
                          "        x.hour, x.minute, x.second, x.nanosecond]",
-                         x=DateTime(1976, 6, 13, 12, 34, 56.789012345))
+                         x=DateTime(1976, 6, 13, 12, 34, 56, 789012345))
     year, month, day, hour, minute, second, nanosecond = result
     assert year == 1976
     assert month == 6
@@ -166,7 +166,7 @@ def test_datetime_with_numeric_time_offset_input(cypher_eval):
                          "RETURN [x.year, x.month, x.day, "
                          "        x.hour, x.minute, x.second, "
                          "        x.nanosecond, x.offset]",
-                         x=DateTime(1976, 6, 13, 12, 34, 56.789012345,
+                         x=DateTime(1976, 6, 13, 12, 34, 56, 789012345,
                                     tzinfo=FixedOffset(90)))
     year, month, day, hour, minute, second, nanosecond, offset = result
     assert year == 1976
@@ -180,7 +180,7 @@ def test_datetime_with_numeric_time_offset_input(cypher_eval):
 
 
 def test_datetime_with_named_time_zone_input(cypher_eval):
-    dt = DateTime(1976, 6, 13, 12, 34, 56.789012345)
+    dt = DateTime(1976, 6, 13, 12, 34, 56, 789012345)
     input_value = timezone("US/Pacific").localize(dt)
     result = cypher_eval("CYPHER runtime=interpreted WITH $x AS x "
                          "RETURN [x.year, x.month, x.day, "
@@ -199,7 +199,7 @@ def test_datetime_with_named_time_zone_input(cypher_eval):
 
 
 def test_datetime_array_input(cypher_eval):
-    data = [DateTime(2018, 4, 6, 13, 4, 42.516120), DateTime(1976, 6, 13)]
+    data = [DateTime(2018, 4, 6, 13, 4, 42, 516120), DateTime(1976, 6, 13)]
     value = cypher_eval("CREATE (a {x:$x}) RETURN a.x", x=data)
     assert value == data
 
@@ -209,7 +209,7 @@ def test_duration_input(cypher_eval):
                          "RETURN [x.months, x.days, x.seconds, "
                          "        x.microsecondsOfSecond]",
                          x=Duration(years=1, months=2, days=3, hours=4,
-                                    minutes=5, seconds=6.789012))
+                                    minutes=5, seconds=6, microseconds=789012))
     months, days, seconds, microseconds = result
     assert months == 14
     assert days == 3
@@ -258,13 +258,13 @@ def test_whole_second_time_output(cypher_eval):
 def test_nanosecond_resolution_time_output(cypher_eval):
     value = cypher_eval("RETURN time('12:34:56.789012345')")
     assert isinstance(value, Time)
-    assert value == Time(12, 34, 56.789012345, tzinfo=FixedOffset(0))
+    assert value == Time(12, 34, 56, 789012345, tzinfo=FixedOffset(0))
 
 
 def test_time_with_numeric_time_offset_output(cypher_eval):
     value = cypher_eval("RETURN time('12:34:56.789012345+0130')")
     assert isinstance(value, Time)
-    assert value == Time(12, 34, 56.789012345, tzinfo=FixedOffset(90))
+    assert value == Time(12, 34, 56, 789012345, tzinfo=FixedOffset(90))
 
 
 def test_whole_second_localtime_output(cypher_eval):
@@ -276,7 +276,7 @@ def test_whole_second_localtime_output(cypher_eval):
 def test_nanosecond_resolution_localtime_output(cypher_eval):
     value = cypher_eval("RETURN localtime('12:34:56.789012345')")
     assert isinstance(value, Time)
-    assert value == Time(12, 34, 56.789012345)
+    assert value == Time(12, 34, 56, 789012345)
 
 
 def test_whole_second_datetime_output(cypher_eval):
@@ -288,22 +288,22 @@ def test_whole_second_datetime_output(cypher_eval):
 def test_nanosecond_resolution_datetime_output(cypher_eval):
     value = cypher_eval("RETURN datetime('1976-06-13T12:34:56.789012345')")
     assert isinstance(value, DateTime)
-    assert value == DateTime(1976, 6, 13, 12, 34, 56.789012345, tzinfo=utc)
+    assert value == DateTime(1976, 6, 13, 12, 34, 56, 789012345, tzinfo=utc)
 
 
 def test_datetime_with_numeric_time_offset_output(cypher_eval):
     value = cypher_eval("RETURN "
                         "datetime('1976-06-13T12:34:56.789012345+01:30')")
     assert isinstance(value, DateTime)
-    assert value == DateTime(1976, 6, 13, 12, 34, 56.789012345,
+    assert value == DateTime(1976, 6, 13, 12, 34, 56, 789012345,
                              tzinfo=FixedOffset(90))
 
 
 def test_datetime_with_named_time_zone_output(cypher_eval):
     value = cypher_eval("RETURN datetime('1976-06-13T12:34:56.789012345"
                         "[Europe/London]')")
     assert isinstance(value, DateTime)
-    dt = DateTime(1976, 6, 13, 12, 34, 56.789012345)
+    dt = DateTime(1976, 6, 13, 12, 34, 56, 789012345)
     assert value == timezone("Europe/London").localize(dt)
 
 
@@ -317,21 +317,21 @@ def test_nanosecond_resolution_localdatetime_output(cypher_eval):
     value = cypher_eval("RETURN "
                         "localdatetime('1976-06-13T12:34:56.789012345')")
     assert isinstance(value, DateTime)
-    assert value == DateTime(1976, 6, 13, 12, 34, 56.789012345)
+    assert value == DateTime(1976, 6, 13, 12, 34, 56, 789012345)
 
 
 def test_duration_output(cypher_eval):
     value = cypher_eval("RETURN duration('P1Y2M3DT4H5M6.789S')")
     assert isinstance(value, Duration)
     assert value == Duration(years=1, months=2, days=3, hours=4,
-                             minutes=5, seconds=6.789)
+                             minutes=5, seconds=6, milliseconds=789)
 
 
 def test_nanosecond_resolution_duration_output(cypher_eval):
     value = cypher_eval("RETURN duration('P1Y2M3DT4H5M6.789123456S')")
     assert isinstance(value, Duration)
     assert value == Duration(years=1, months=2, days=3, hours=4,
-                             minutes=5, seconds=6.789123456)
+                             minutes=5, seconds=6, nanoseconds=789123456)
 
 
 def test_datetime_parameter_case1(session):

tests/stub/test_directdriver.py

@@ -21,6 +21,7 @@
 
 import pytest
 
+import neo4j
 from neo4j.exceptions import (
     ServiceUnavailable,
     ConfigurationError,
@@ -80,7 +81,9 @@ def test_direct_driver_with_wrong_port(driver_info):
     uri = "bolt://127.0.0.1:9002"
     with pytest.raises(ServiceUnavailable):
         driver = GraphDatabase.driver(uri, auth=driver_info["auth_token"], **driver_config)
-        driver.verify_connectivity()
+        with pytest.warns(neo4j.ExperimentalWarning,
+                          match="The configuration may change in the future."):
+            driver.verify_connectivity()
 
 
 @pytest.mark.parametrize(
@@ -96,7 +99,13 @@ def test_direct_verify_connectivity(driver_info, test_script, test_expected):
         uri = "bolt://localhost:9001"
         with GraphDatabase.driver(uri, auth=driver_info["auth_token"], **driver_config) as driver:
             assert isinstance(driver, BoltDriver)
-            assert driver.verify_connectivity(default_access_mode=READ_ACCESS) == test_expected
+            with pytest.warns(
+                    neo4j.ExperimentalWarning,
+                    match="The configuration may change in the future."
+            ):
+                assert driver.verify_connectivity(
+                    default_access_mode=READ_ACCESS
+                ) == test_expected
 
 
 @pytest.mark.parametrize(
@@ -112,4 +121,8 @@ def test_direct_verify_connectivity_disconnect_on_run(driver_info, test_script):
         uri = "bolt://127.0.0.1:9001"
         with GraphDatabase.driver(uri, auth=driver_info["auth_token"], **driver_config) as driver:
             with pytest.raises(ServiceUnavailable):
-                driver.verify_connectivity(default_access_mode=READ_ACCESS)
+                with pytest.warns(
+                        neo4j.ExperimentalWarning,
+                        match="The configuration may change in the future."
+                ):
+                    driver.verify_connectivity(default_access_mode=READ_ACCESS)