Skip to content

Commit 3faa958

Browse files
committed
Removed assertion to work with 3.5
1 parent 46d5402 commit 3faa958

File tree

3 files changed

+4
-11
lines changed

3 files changed

+4
-11
lines changed

test/tck/resultparser.py

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
import json
2222
import re
2323
from neo4j.v1 import Node, Relationship, Path
24-
from tck_util import Value
24+
from tck_util import TestValue
2525

2626

2727
def parse_values_to_comparable(row):
@@ -67,13 +67,11 @@ def get_map(val):
6767

6868

6969
def value_to_comparable_object(val):
70-
return Value(value_to_object(val))
70+
return TestValue(value_to_object(val))
7171

7272

7373
def value_to_object(val):
7474
val = val.strip()
75-
print("VAL")
76-
print(val)
7775
PATH = '^(<\().*(\)>)$'
7876
NODE = '^(\().*(\))$'
7977
RELATIONSHIP = '^(\[:).*(\])$'

test/tck/steps/cypher_compability_steps.py

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020

2121
from behave import *
2222

23-
from test.tck.tck_util import Value, send_string, send_parameters
23+
from test.tck.tck_util import TestValue, send_string, send_parameters
2424
from test.tck.resultparser import parse_values, parse_values_to_comparable
2525

2626
use_step_matcher("re")
@@ -60,7 +60,7 @@ def _driver_value_to_comparable(val):
6060
l = [_driver_value_to_comparable(v) for v in val]
6161
return l
6262
else:
63-
return Value(val)
63+
return TestValue(val)
6464

6565

6666
def table_to_comparable_result(table):
@@ -84,14 +84,10 @@ def unordered_equal(given, expected):
8484
l2 = expected[:]
8585
assert isinstance(l1, list)
8686
assert isinstance(l2, list)
87-
print(len(l1))
88-
print(len(l2))
8987
assert len(l1) == len(l2)
9088
for d1 in l1:
9189
size = len(l2)
9290
for d2 in l2:
93-
print(d2)
94-
print(d1)
9591
if d1 == d2:
9692
l2.remove(d2)
9793
break

test/tck/tck_util.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,6 @@ def __hash__(self):
100100
return hash(repr(self))
101101

102102
def __eq__(self, other):
103-
assert isinstance(other, TestValue)
104103
return self.content == other.content
105104

106105
def __repr__(self):

0 commit comments

Comments
 (0)