Skip to content

Commit a09de9a

Browse files
author
Zhen
committed
Fix the import problem on 3.4
Removed some test assumption that is no longer true for server 3.2 to avoid test error
1 parent ec1c223 commit a09de9a

12 files changed

+21
-259
lines changed

test/examples/autocommit_transaction_example.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020

2121
# tag::autocommit-transaction-import[]
2222
from neo4j.v1 import Session;
23-
from base_application import BaseApplication
23+
from test.examples.base_application import BaseApplication
2424
# end::autocommit-transaction-import[]
2525

2626
class AutocommitTransactionExample(BaseApplication):

test/examples/cypher_error_example.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020

2121
# tag::cypher-error-import[]
2222
from neo4j.v1 import GraphDatabase, ClientError
23-
from base_application import BaseApplication
23+
from test.examples.base_application import BaseApplication
2424
# end::cypher-error-import[]
2525

2626
class CypherErrorExample(BaseApplication):

test/examples/hello_world_example.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020

2121
# tag::hello-world-import[]
2222
from neo4j.v1 import GraphDatabase
23-
from base_application import BaseApplication
23+
from test.examples.base_application import BaseApplication
2424
# end::hello-world-import[]
2525

2626
# tag::hello-world[]

test/examples/read_write_transaction_example.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020

2121
# tag::read-write-transaction-import[]
2222
from neo4j.v1 import GraphDatabase
23-
from base_application import BaseApplication
23+
from test.examples.base_application import BaseApplication
2424
# end::read-write-transaction-import[]
2525

2626
class ReadWriteTransactionExample(BaseApplication):

test/examples/result_consume_example.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020

2121
# tag::result-consume-import[]
2222
from neo4j.v1 import GraphDatabase
23-
from base_application import BaseApplication
23+
from test.examples.base_application import BaseApplication
2424
# end::result-consume-import[]
2525

2626
class ResultConsumeExample(BaseApplication):

test/examples/result_retain_example.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020

2121
# tag::result-retain-import[]
2222
from neo4j.v1 import GraphDatabase
23-
from base_application import BaseApplication
23+
from test.examples.base_application import BaseApplication
2424
# end::result-retain-import[]
2525

2626
class ResultRetainExample(BaseApplication):

test/examples/service_unavailable_example.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020

2121
# tag::service-unavailable-import[]
2222
from neo4j.v1 import GraphDatabase, ServiceUnavailable
23-
from base_application import BaseApplication
23+
from test.examples.base_application import BaseApplication
2424
# end::service-unavailable-import[]
2525

2626
class ServiceUnavailableExample(BaseApplication):

test/examples/session_example.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
# limitations under the License.
2020

2121
# tag::session-import[]
22-
from base_application import BaseApplication
22+
from test.examples.base_application import BaseApplication
2323
# end::session-import[]
2424

2525
class SessionExample(BaseApplication):

test/examples/test_examples.py

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -47,29 +47,29 @@ def setUp(self):
4747
self.clean()
4848

4949
def test_autocommit_transaction_example(self):
50-
from autocommit_transaction_example import AutocommitTransactionExample
50+
from test.examples.autocommit_transaction_example import AutocommitTransactionExample
5151

5252
example = AutocommitTransactionExample(self.bolt_uri, self.user, self.password)
5353
example.add_person('Alice')
5454

5555
self.assertTrue(self.person_count('Alice') > 0)
5656

5757
def test_basic_auth_example(self):
58-
from basic_auth_example import BasicAuthExample
58+
from test.examples.basic_auth_example import BasicAuthExample
5959

6060
example = BasicAuthExample(self.bolt_uri, self.user, self.password)
6161

6262
self.assertTrue(example.can_connect())
6363

6464
def test_config_unencrypted_example(self):
65-
from config_unencrypted_example import ConfigUnencryptedExample
65+
from test.examples.config_unencrypted_example import ConfigUnencryptedExample
6666

6767
example = ConfigUnencryptedExample(self.bolt_uri, self.user, self.password)
6868

6969
self.assertIsInstance(example, ConfigUnencryptedExample)
7070

7171
def test_cypher_error_example(self):
72-
from cypher_error_example import CypherErrorExample
72+
from test.examples.cypher_error_example import CypherErrorExample
7373

7474
f = get_string_io()
7575
with stdout_redirector(f):
@@ -85,15 +85,15 @@ def test_cypher_error_example(self):
8585
^"""))
8686

8787
def test_driver_lifecycle_example(self):
88-
from driver_lifecycle_example import DriverLifecycleExample
88+
from test.examples.driver_lifecycle_example import DriverLifecycleExample
8989

9090
example = DriverLifecycleExample(self.bolt_uri, self.user, self.password)
9191
example.close()
9292

9393
self.assertIsInstance(example, DriverLifecycleExample)
9494

9595
def test_hello_world_example(self):
96-
from hello_world_example import HelloWorldExample
96+
from test.examples.hello_world_example import HelloWorldExample
9797

9898
f = get_string_io()
9999
with stdout_redirector(f):
@@ -104,15 +104,15 @@ def test_hello_world_example(self):
104104
self.assertTrue(f.getvalue().startswith("hello, world, from node"))
105105

106106
def test_read_write_transaction_example(self):
107-
from read_write_transaction_example import ReadWriteTransactionExample
107+
from test.examples.read_write_transaction_example import ReadWriteTransactionExample
108108

109109
example = ReadWriteTransactionExample(self.bolt_uri, self.user, self.password)
110110
node_count = example.add_person('Alice')
111111

112112
self.assertTrue(node_count > 0)
113113

114114
def test_result_consume_example(self):
115-
from result_consume_example import ResultConsumeExample
115+
from test.examples.result_consume_example import ResultConsumeExample
116116

117117
self.write("CREATE (a:Person {name: 'Alice'})")
118118
self.write("CREATE (a:Person {name: 'Bob'})")
@@ -122,7 +122,7 @@ def test_result_consume_example(self):
122122
self.assertEqual(['Alice', 'Bob'], people)
123123

124124
def test_result_retain_example(self):
125-
from result_retain_example import ResultRetainExample
125+
from test.examples.result_retain_example import ResultRetainExample
126126

127127
self.write("CREATE (a:Person {name: 'Alice'})")
128128
self.write("CREATE (a:Person {name: 'Bob'})")
@@ -133,15 +133,15 @@ def test_result_retain_example(self):
133133
self.assertEqual(employee_count, 2)
134134

135135
def test_session_example(self):
136-
from session_example import SessionExample
136+
from test.examples.session_example import SessionExample
137137

138138
example = SessionExample(self.bolt_uri, self.user, self.password)
139139
example.do_work()
140140

141141
self.assertIsInstance(example, SessionExample)
142142

143143
def test_transaction_function_example(self):
144-
from transaction_function_example import TransactionFunctionExample
144+
from test.examples.transaction_function_example import TransactionFunctionExample
145145

146146
example = TransactionFunctionExample(self.bolt_uri, self.user, self.password)
147147
example.add_person("Alice")
@@ -175,7 +175,7 @@ def person_count(self, name):
175175
class ServiceUnavailableTest(IntegrationTestCase):
176176

177177
def test_service_unavailable_example(self):
178-
from service_unavailable_example import ServiceUnavailableExample
178+
from test.examples.service_unavailable_example import ServiceUnavailableExample
179179

180180
example = ServiceUnavailableExample(self.bolt_uri, self.user, self.password)
181181
self.__class__._stop_server()

test/examples/transaction_function_example.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020

2121
# tag::transaction-function-import[]
2222
from neo4j.v1 import GraphDatabase
23-
from base_application import BaseApplication
23+
from test.examples.base_application import BaseApplication
2424
# end::transaction-function-import[]
2525

2626
class TransactionFunctionExample(BaseApplication):

0 commit comments

Comments
 (0)