Merge branch '1.2' into 1.3

Author: Zhen

neo4j/v1/api.py

@@ -209,7 +209,7 @@ class Session(object):
 
     def __init__(self, acquirer, max_retry_time=None, access_mode=None, bookmark=None):
         self._acquirer = acquirer
-        self._max_retry_time = max_retry_time or DEFAULT_MAX_RETRY_TIME
+        self._max_retry_time = DEFAULT_MAX_RETRY_TIME if max_retry_time is None else max_retry_time
         self._default_access_mode = access_mode or WRITE_ACCESS
         self._bookmark = bookmark
 
@@ -422,8 +422,8 @@ def _run_transaction(self, access_mode, unit_of_work, *args, **kwargs):
                                             RETRY_DELAY_MULTIPLIER,
                                             RETRY_DELAY_JITTER_FACTOR)
         last_error = None
-        t0 = t1 = time()
-        while t1 - t0 <= self._max_retry_time:
+        t0 = time()
+        while True:
             try:
                 self._connect(access_mode)
                 self._create_transaction()
@@ -437,8 +437,10 @@ def _run_transaction(self, access_mode, unit_of_work, *args, **kwargs):
                     last_error = error
                 else:
                     raise error
-            sleep(next(retry_delay))
             t1 = time()
+            if t1 - t0 > self._max_retry_time:
+                break
+            sleep(next(retry_delay))
         raise last_error
 
     def read_transaction(self, unit_of_work, *args, **kwargs):

test/examples/base_application.py

@@ -20,9 +20,10 @@
 
 from neo4j.v1 import GraphDatabase
 
+
 class BaseApplication(object):
     def __init__(self, uri, user, password):
-        self._driver = GraphDatabase.driver( uri, auth=( user, password ) )
+        self._driver = GraphDatabase.driver(uri, auth=( user, password ), max_retry_time=0)
 
     def close(self):
         self._driver.close()

test/examples/config_max_retry_time_example.py

@@ -22,11 +22,11 @@
 from neo4j.v1 import GraphDatabase
 # end::config-max-retry-time-import[]
 
+
 class ConfigMaxRetryTimeExample:
     # tag::config-max-retry-time[]
     def __init__(self, uri, user, password):
-        self._driver = GraphDatabase.driver(uri, auth=(user, password),
-                Config.build().withMaxTransactionRetryTime( 15, SECONDS ).toConfig() )
+        self._driver = GraphDatabase.driver(uri, auth=(user, password), max_retry_time=15)
     # end::config-max-retry-time[]
 
     def close(self):

test/examples/config_trust_example.py

@@ -19,14 +19,14 @@
 # limitations under the License.
 
 # tag::config-trust-import[]
-from neo4j.v1 import GraphDatabase
+from neo4j.v1 import GraphDatabase, TRUST_ALL_CERTIFICATES
 # end::config-trust-import[]
 
+
 class ConfigTrustExample:
     # tag::config-trust[]
     def __init__(self, uri, user, password):
-        self._driver = GraphDatabase.driver(uri, auth=(user, password),
-                Config.build().withTrustStrategy( Config.TrustStrategy.trustSystemCertificates() ).toConfig() )
+        self._driver = GraphDatabase.driver(uri, auth=(user, password), trust=TRUST_ALL_CERTIFICATES)
     # end::config-trust[]
 
     def close(self):

test/examples/config_unencrypted_example.py

@@ -22,11 +22,12 @@
 from neo4j.v1 import GraphDatabase
 # end::config-unencrypted-import[]
 
+
 class ConfigUnencryptedExample:
     # tag::config-unencrypted[]
     def __init__(self, uri, user, password):
         self._driver = GraphDatabase.driver(uri, auth=(user, password), encrypted=False)
     # end::config-unencrypted[]
 
     def close(self):
-        self._driver.close();
+        self._driver.close()

test/examples/test_examples.py

@@ -156,7 +156,6 @@ def test_transaction_function_example(self):
 
         self.assertEqual(self.person_count("Alice"), 1)
 
-        
     def read(self, statement):
         from neo4j.v1 import GraphDatabase
         with GraphDatabase.driver(self.bolt_uri, auth=self.auth_token) as driver:

test/stub/test_directdriver.py

@@ -57,7 +57,7 @@ def test_direct_should_reject_routing_context(self):
     def test_direct_session_close_after_server_close(self):
         with StubCluster({9001: "disconnect_after_init.script"}):
             uri = "bolt://127.0.0.1:9001"
-            with GraphDatabase.driver(uri, auth=self.auth_token, encrypted=False) as driver:
+            with GraphDatabase.driver(uri, auth=self.auth_token, encrypted=False, max_retry_time=0) as driver:
                 with driver.session() as session:
                     with self.assertRaises(ServiceUnavailable):
                         session.write_transaction(lambda tx: tx.run("CREATE (a:Item)"))