Now works with both 2.7 and 3.5

Author: RagnarW

test/tck/steps/bolt_compability_steps.py

@@ -80,15 +80,17 @@ def step_impl(context, size, type):
 
 @when("the driver asks the server to echo this (?P<unused>.+) back")
 def step_impl(context, unused):
-    context.results = [ send_string("RETURN " + as_cypher_text(context.expected)).stream(), send_parameters("RETURN {input}", {'input': context.expected}).stream()]
+    context.results = [ send_string("RETURN " + as_cypher_text(context.expected)), send_parameters("RETURN {input}", {'input': context.expected})]
 
 
 @step("the value given in the result should be the same as what was sent")
 def step_impl(context):
     assert len(context.results) > 0
     for result in context.results:
-        result_value = result.next().values()[0]
+        assert result.next()
+        result_value = result.record().values()[0]
         assert result_value == context.expected
+        assert result.at_end()
 
 
 def as_cypher_text(expected):

test/tck/steps/driver_equality_steps.py

@@ -37,7 +37,7 @@ def step_impl(context, key1, key2):
 
 @step("saved values should all equal")
 def step_impl(context):
-    values = context.values.values()
+    values = list(context.values.values())
     assert len(values) > 1
     first_val = values.pop()
     for item in values:
@@ -46,7 +46,7 @@ def step_impl(context):
 
 @step("none of the saved values should be equal")
 def step_impl(context):
-    values = context.values.values()
+    values = list(context.values.values())
     assert len(values) > 1
     first_val = values.pop()
     for item in values: