Updated tests

Author: technige

.gitignore

@@ -9,6 +9,7 @@ htmlcov
 .coverage
 .test
 .tox
+.cache
 
 docs/build
 dist

neo4j/v1/api.py

@@ -275,7 +275,10 @@ def _connect(self, access_mode=None):
     def _disconnect(self, sync):
         if self._connection:
             if sync:
-                self._connection.sync()
+                try:
+                    self._connection.sync()
+                except ServiceUnavailable:
+                    pass
             if self._connection:
                 self._connection.in_use = False
                 self._connection = None

test/__main__.py

@@ -45,6 +45,7 @@ def add_employee_to_company(tx, person, company_name):
                "MERGE (com:Company {name: $company_name}) "
                "MERGE (emp)-[:WORKS_FOR]->(com)",
                person_name=person["name"], company_name=company_name)
+        return 1
 
     @staticmethod
     def match_person_nodes(tx):

test/examples/__main__.py

@@ -21,7 +21,7 @@
 from test.examples.base_application import BaseApplication
 
 # tag::service-unavailable-import[]
-from neo4j.v1 import ServiceUnavailable
+from neo4j.exceptions import ServiceUnavailable
 # end::service-unavailable-import[]
 
 
@@ -31,10 +31,10 @@ def __init__(self, uri, user, password):
 
     # tag::service-unavailable[]
     def add_item(self):
-        with self._driver.session() as session:
-            try:
+        try:
+            with self._driver.session() as session:
                 session.write_transaction(lambda tx: tx.run("CREATE (a:Item)"))
-                return True
-            except ServiceUnavailable:
-                return False
+            return True
+        except ServiceUnavailable:
+            return False
     # end::service-unavailable[]

test/examples/result_retain_example.py

@@ -18,13 +18,17 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+
+from contextlib import contextmanager
+from io import StringIO
+import sys
+from unittest import TestCase
+
 from test.integration.tools import IntegrationTestCase
 
 
-## Python2 doesn't have contextlib.redirect_stdout()
-#  http://eli.thegreenplace.net/2015/redirecting-all-kinds-of-stdout-in-python/
-import sys
-from contextlib import contextmanager
+# Python2 doesn't have contextlib.redirect_stdout()
+#   http://eli.thegreenplace.net/2015/redirecting-all-kinds-of-stdout-in-python/
 @contextmanager
 def stdout_redirector(stream):
     old_stdout = sys.stdout
@@ -34,12 +38,6 @@ def stdout_redirector(stream):
     finally:
         sys.stdout = old_stdout
 
-def get_string_io():
-    if sys.version_info[0] < 3:
-        from StringIO import StringIO
-    else:
-        from io import StringIO
-    return StringIO()
 
 class ExamplesTest(IntegrationTestCase):
 
@@ -78,7 +76,7 @@ def test_config_unencrypted_example(self):
     def test_cypher_error_example(self):
         from test.examples.cypher_error_example import CypherErrorExample
 
-        f = get_string_io()
+        f = StringIO()
         with stdout_redirector(f):
             example = CypherErrorExample(self.bolt_uri, self.user, self.password)
             try:
@@ -102,7 +100,7 @@ def test_driver_lifecycle_example(self):
     def test_hello_world_example(self):
         from test.examples.hello_world_example import HelloWorldExample
 
-        f = get_string_io()
+        f = StringIO()
         with stdout_redirector(f):
             example = HelloWorldExample(self.bolt_uri, self.user, self.password)
             example.print_greeting("hello, world")
@@ -185,6 +183,6 @@ def test_service_unavailable_example(self):
         from test.examples.service_unavailable_example import ServiceUnavailableExample
 
         example = ServiceUnavailableExample(self.bolt_uri, self.user, self.password)
-        self.__class__._stop_server()
+        self._stop_server()
 
-        self.assertFalse(example.addItem())
+        self.assertFalse(example.add_item())

test/examples/service_unavailable_example.py

@@ -0,0 +1,78 @@
+#!/usr/bin/env python
+# -*- encoding: utf-8 -*-
+
+# Copyright (c) 2002-2017 "Neo Technology,"
+# Network Engine for Objects in Lund AB [http://neotechnology.com]
+#
+# This file is part of Neo4j.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+
+from itertools import product
+
+from pytest import mark
+
+from neo4j.v1 import GraphDatabase
+from .tools import GraphDatabaseServer
+
+
+class ReadWorkload(object):
+
+    server = None
+    driver = None
+
+    @classmethod
+    def setup_class(cls):
+        cls.server = server = GraphDatabaseServer()
+        server.start()
+        cls.driver = GraphDatabase.driver(server.bolt_uri, auth=server.auth_token)
+
+    @classmethod
+    def teardown_class(cls):
+        cls.driver.close()
+        cls.server.stop()
+
+    def work(self, *units_of_work):
+        def runner():
+            with self.driver.session() as session:
+                for unit_of_work in units_of_work:
+                    session.read_transaction(unit_of_work)
+        return runner
+
+
+class TestReadWorkload(ReadWorkload):
+
+    @staticmethod
+    def test_cypher(width):
+        return "UNWIND range(1, $count) AS _ RETURN {}".format(", ".join("$x AS x{}".format(i) for i in range(width)))
+
+    @staticmethod
+    def uow(record_count, record_width, value):
+
+        def _(tx):
+            s = "UNWIND range(1, $record_count) AS _ RETURN {}".format(
+                ", ".join("$x AS x{}".format(i) for i in range(record_width)))
+            p = {"record_count": record_count, "x": value}
+            for record in tx.run(s, p):
+                assert all(x == value for x in record.values())
+
+        return _
+
+    @mark.parametrize("record_count,record_width,value", product(
+        [1, 1000],  # record count
+        [1, 10],    # record width
+        [1, u'hello, world'],        # value
+    ))
+    def test_1x1(self, benchmark, record_count, record_width, value):
+        benchmark(self.work(self.uow(record_count, record_width, value)))