Skip to content

Commit 64cbfa5

Browse files
authored
Merge pull request #161 from zhenlineo/1.2-without-examples
Test without examples
2 parents 6574439 + 1f8d811 commit 64cbfa5

21 files changed

+5
-847
lines changed

neo4j/v1/api.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
from collections import deque
2323
from random import random
2424
from threading import RLock
25-
from time import time, sleep
25+
from time import clock, sleep
2626
from warnings import warn
2727

2828
from neo4j.bolt import ProtocolError, ServiceUnavailable
@@ -422,7 +422,7 @@ def _run_transaction(self, access_mode, unit_of_work, *args, **kwargs):
422422
RETRY_DELAY_MULTIPLIER,
423423
RETRY_DELAY_JITTER_FACTOR)
424424
last_error = None
425-
t0 = t1 = time()
425+
t0 = t1 = clock()
426426
while t1 - t0 <= self._max_retry_time:
427427
try:
428428
self._create_transaction()
@@ -438,7 +438,7 @@ def _run_transaction(self, access_mode, unit_of_work, *args, **kwargs):
438438
else:
439439
raise error
440440
sleep(next(retry_delay))
441-
t1 = time()
441+
t1 = clock()
442442
raise last_error
443443

444444
def read_transaction(self, unit_of_work, *args, **kwargs):

neo4j/v1/session.py

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -47,11 +47,8 @@ def __run__(self, statement, parameters):
4747
result.statement = statement
4848
result.parameters = parameters
4949

50-
try:
51-
self._connection.append(RUN, (statement, parameters), response=run_response)
52-
self._connection.append(PULL_ALL, response=pull_all_response)
53-
except AttributeError:
54-
pass
50+
self._connection.append(RUN, (statement, parameters), response=run_response)
51+
self._connection.append(PULL_ALL, response=pull_all_response)
5552

5653
return result
5754

test/examples/__main__.py

Lines changed: 0 additions & 25 deletions
This file was deleted.

test/examples/autocommit_transaction_example.py

Lines changed: 0 additions & 34 deletions
This file was deleted.

test/examples/base_application.py

Lines changed: 0 additions & 28 deletions
This file was deleted.

test/examples/basic_auth_example.py

Lines changed: 0 additions & 36 deletions
This file was deleted.

test/examples/config_connection_timeout_example.py

Lines changed: 0 additions & 33 deletions
This file was deleted.

test/examples/config_max_retry_time_example.py

Lines changed: 0 additions & 33 deletions
This file was deleted.

test/examples/config_trust_example.py

Lines changed: 0 additions & 33 deletions
This file was deleted.

test/examples/config_unencrypted_example.py

Lines changed: 0 additions & 32 deletions
This file was deleted.

0 commit comments

Comments
 (0)