[4.4] Decorator fix (#454)

* Fix guard decorator

Test were skipped by accident.

* Fix decorator order

* Replace relative with absolute imports to match the rest

* Fix now enabled test for JavaScript

* Work around server bug

server bug on 4.4-: does not report db on DISCARD before PULL

Co-authored-by: Rouven Bauer <[email protected]>

Author: klobuczek

tests/neo4j/shared.py

@@ -140,8 +140,8 @@ def get_valid_test_case(*args, **kwargs):
             raise TypeError("Should only decorate TestkitTestCase methods")
         return args[0]
 
-    @wraps(func)
     @requires_min_bolt_version(protocol.Feature.BOLT_4_0)
+    @wraps(func)
     def wrapper(*args, **kwargs):
         test_case = get_valid_test_case(*args, **kwargs)
         if not get_server_info().supports_multi_db:
@@ -160,8 +160,8 @@ def requires_min_bolt_version(feature):
     server_max_version = get_server_info().max_protocol_version
     all_viable_versions = [
         f for f in protocol.Feature
-        if (f.value.startswith("BOLT_")
-            and min_version <= f.value.spit(":")[-1] <= server_max_version)
+        if (f.name.startswith("BOLT_")
+            and min_version <= f.value.split(":")[-1] <= server_max_version)
     ]
 
     def get_valid_test_case(*args, **kwargs):

tests/neo4j/test_direct_driver.py

@@ -1,11 +1,5 @@
 from nutkit import protocol as types
-
-from ..shared import (
-    dns_resolve_single,
-    get_driver_name,
-    TestkitTestCase,
-)
-from .shared import (
+from tests.neo4j.shared import (
     cluster_unsafe_test,
     get_driver,
     get_neo4j_host_and_http_port,
@@ -14,6 +8,11 @@
     get_server_info,
     requires_multi_db_support,
 )
+from tests.shared import (
+    dns_resolve_single,
+    get_driver_name,
+    TestkitTestCase,
+)
 
 
 class TestDirectDriver(TestkitTestCase):
@@ -129,6 +128,8 @@ def test_multi_db(self):
 
             self._session = self._driver.session("r", database="test-database")
             result = self._session.run("RETURN 1")
+            # server bug on 4.4-: does not report db on DISCARD before PULL
+            result.next()
             summary = result.consume()
             self.assertEqual(summary.database, "test-database")
 
@@ -158,7 +159,7 @@ def get_names(result_, node=True):
             for record in result_:
                 if node:
                     self.assertEqual(len(record.values), 1)
-                    if get_driver_name() not in ["dotnet"]:
+                    if get_driver_name() not in ["dotnet", "javascript"]:
                         # missing former types.Feature.TMP_RESULT_KEYS
                         self.assertEqual(result_.keys(), ["p"])
                     p = record.values[0]
@@ -167,7 +168,7 @@ def get_names(result_, node=True):
                     name = p.props.value.get("name")
                 else:
                     idx = 0
-                    if get_driver_name() not in ["dotnet"]:
+                    if get_driver_name() not in ["dotnet", "javascript"]:
                         # missing former types.Feature.TMP_RESULT_KEYS
                         keys = result_.keys()
                         self.assertIn("name", keys)

tests/neo4j/test_summary.py

@@ -1,17 +1,16 @@
 from nutkit import protocol as types
-
-from ..shared import (
-    get_driver_name,
-    TestkitTestCase,
-)
-from .shared import (
+from tests.neo4j.shared import (
     cluster_unsafe_test,
     get_driver,
     get_neo4j_host_and_port,
     get_neo4j_resolved_host_and_port,
     get_server_info,
     requires_multi_db_support,
 )
+from tests.shared import (
+    get_driver_name,
+    TestkitTestCase,
+)
 
 
 class TestSummary(TestkitTestCase):

tests/stub/iteration/test_result_list.py

@@ -1,7 +1,6 @@
 import nutkit.protocol as types
 from tests.shared import get_driver_name
-
-from ._common import IterationTestBase
+from tests.stub.iteration._common import IterationTestBase
 
 
 class TestResultList(IterationTestBase):

tests/stub/iteration/test_result_peek.py

@@ -3,8 +3,7 @@
     driver_feature,
     get_driver_name,
 )
-
-from ._common import IterationTestBase
+from tests.stub.iteration._common import IterationTestBase
 
 
 class TestResultPeek(IterationTestBase):

tests/stub/iteration/test_result_single.py

@@ -3,8 +3,7 @@
     driver_feature,
     get_driver_name,
 )
-
-from ._common import IterationTestBase
+from tests.stub.iteration._common import IterationTestBase
 
 
 class TestResultSingle(IterationTestBase):