test: make output of box-py/call.test.py deterministic

Totktonada · Totktonada · commit 4e5f15ab344f · 2021-03-16T01:13:31.000+03:00
Response object is a unpacked msgpack structure, returned by Tarantool. Nor msgpack-python [1] that used in tarantool-python nor msgpack [2] itself cannot guarantee an order of keys in unpacked dictionaries. Therefore we have different keys order with running tests under Python 2 and Python 3, for example box-py/call.test.py. To workaround a problem proposed a conversion of dictionaries in a tuple to lists before printing Response object. Requires changes in tarantool-python [3]. 1. msgpack/msgpack-python#164 2. msgpack/msgpack#215 3. tarantool/tarantool-python#186 Part of #5652 Follows up #5538 (cherry picked from commit 45972c9)
diff --git a/test/box-py/call.result b/test/box-py/call.result
@@ -320,22 +320,22 @@ call f()
 - 3
 eval (return true)()
 ---
-- True
+- true
 function f(...) return true end
 ---
 ...
 call f()
 ---
-- True
+- true
 eval (return nil)()
 ---
-- None
+- null
 function f(...) return nil end
 ---
 ...
 call f()
 ---
-- None
+- null
 eval (return )()
 ---
 
@@ -374,96 +374,96 @@ call f()
 - [1, 2, 3]
 eval (return {k1 = 'v1', k2 = 'v2'})()
 ---
-- {'k2': 'v2', 'k1': 'v1'}
+- {"k1": "v1", "k2": "v2"}
 function f(...) return {k1 = 'v1', k2 = 'v2'} end
 ---
 ...
 call f()
 ---
-- {'k2': 'v2', 'k1': 'v1'}
+- {"k1": "v1", "k2": "v2"}
 eval (return {k1 = 'v1', k2 = 'v2'})()
 ---
-- {'k2': 'v2', 'k1': 'v1'}
+- {"k1": "v1", "k2": "v2"}
 function f(...) return {k1 = 'v1', k2 = 'v2'} end
 ---
 ...
 call f()
 ---
-- {'k2': 'v2', 'k1': 'v1'}
+- {"k1": "v1", "k2": "v2"}
 eval (return {s = {1, 1428578535}, u = 1428578535, v = {}, c = {['2'] = {1, 1428578535}, ['106'] = { 1, 1428578535} }, pc = {['2'] = {1, 1428578535, 9243}, ['106'] = {1, 1428578535, 9243}}})()
 ---
-- {'pc': {'2': [1, 1428578535, 9243], '106': [1, 1428578535, 9243]}, 's': [1, 1428578535], 'u': 1428578535, 'c': {'2': [1, 1428578535], '106': [1, 1428578535]}, 'v': []}
+- {"c": {"106": [1, 1428578535], "2": [1, 1428578535]}, "pc": {"106": [1, 1428578535, 9243], "2": [1, 1428578535, 9243]}, "s": [1, 1428578535], "u": 1428578535, "v": []}
 function f(...) return {s = {1, 1428578535}, u = 1428578535, v = {}, c = {['2'] = {1, 1428578535}, ['106'] = { 1, 1428578535} }, pc = {['2'] = {1, 1428578535, 9243}, ['106'] = {1, 1428578535, 9243}}} end
 ---
 ...
 call f()
 ---
-- {'pc': {'2': [1, 1428578535, 9243], '106': [1, 1428578535, 9243]}, 's': [1, 1428578535], 'u': 1428578535, 'c': {'2': [1, 1428578535], '106': [1, 1428578535]}, 'v': []}
+- {"c": {"106": [1, 1428578535], "2": [1, 1428578535]}, "pc": {"106": [1, 1428578535, 9243], "2": [1, 1428578535, 9243]}, "s": [1, 1428578535], "u": 1428578535, "v": []}
 eval (return true, {s = {1, 1428578535}, u = 1428578535, v = {}, c = {['2'] = {1, 1428578535}, ['106'] = { 1, 1428578535} }, pc = {['2'] = {1, 1428578535, 9243}, ['106'] = {1, 1428578535, 9243}}})()
 ---
-- True
-- {'pc': {'2': [1, 1428578535, 9243], '106': [1, 1428578535, 9243]}, 's': [1, 1428578535], 'u': 1428578535, 'c': {'2': [1, 1428578535], '106': [1, 1428578535]}, 'v': []}
+- true
+- {"c": {"106": [1, 1428578535], "2": [1, 1428578535]}, "pc": {"106": [1, 1428578535, 9243], "2": [1, 1428578535, 9243]}, "s": [1, 1428578535], "u": 1428578535, "v": []}
 function f(...) return true, {s = {1, 1428578535}, u = 1428578535, v = {}, c = {['2'] = {1, 1428578535}, ['106'] = { 1, 1428578535} }, pc = {['2'] = {1, 1428578535, 9243}, ['106'] = {1, 1428578535, 9243}}} end
 ---
 ...
 call f()
 ---
-- True
-- {'pc': {'2': [1, 1428578535, 9243], '106': [1, 1428578535, 9243]}, 's': [1, 1428578535], 'u': 1428578535, 'c': {'2': [1, 1428578535], '106': [1, 1428578535]}, 'v': []}
+- true
+- {"c": {"106": [1, 1428578535], "2": [1, 1428578535]}, "pc": {"106": [1, 1428578535, 9243], "2": [1, 1428578535, 9243]}, "s": [1, 1428578535], "u": 1428578535, "v": []}
 eval (return {s = {1, 1428578535}, u = 1428578535, v = {}, c = {['2'] = {1, 1428578535}, ['106'] = { 1, 1428578535} }, pc = {['2'] = {1, 1428578535, 9243}, ['106'] = {1, 1428578535, 9243}}}, true)()
 ---
-- {'pc': {'2': [1, 1428578535, 9243], '106': [1, 1428578535, 9243]}, 's': [1, 1428578535], 'u': 1428578535, 'c': {'2': [1, 1428578535], '106': [1, 1428578535]}, 'v': []}
-- True
+- {"c": {"106": [1, 1428578535], "2": [1, 1428578535]}, "pc": {"106": [1, 1428578535, 9243], "2": [1, 1428578535, 9243]}, "s": [1, 1428578535], "u": 1428578535, "v": []}
+- true
 function f(...) return {s = {1, 1428578535}, u = 1428578535, v = {}, c = {['2'] = {1, 1428578535}, ['106'] = { 1, 1428578535} }, pc = {['2'] = {1, 1428578535, 9243}, ['106'] = {1, 1428578535, 9243}}}, true end
 ---
 ...
 call f()
 ---
-- {'pc': {'2': [1, 1428578535, 9243], '106': [1, 1428578535, 9243]}, 's': [1, 1428578535], 'u': 1428578535, 'c': {'2': [1, 1428578535], '106': [1, 1428578535]}, 'v': []}
-- True
+- {"c": {"106": [1, 1428578535], "2": [1, 1428578535]}, "pc": {"106": [1, 1428578535, 9243], "2": [1, 1428578535, 9243]}, "s": [1, 1428578535], "u": 1428578535, "v": []}
+- true
 t = box.tuple.new('tuple', {1, 2, 3}, { k1 = 'v', k2 = 'v2'})
 ---
 ...
 eval (return t)()
 ---
-- ['tuple', [1, 2, 3], {'k2': 'v2', 'k1': 'v'}]
+- ["tuple", [1, 2, 3], {"k1": "v", "k2": "v2"}]
 function f(...) return t end
 ---
 ...
 call f()
 ---
-- ['tuple', [1, 2, 3], {'k2': 'v2', 'k1': 'v'}]
+- ["tuple", [1, 2, 3], {"k1": "v", "k2": "v2"}]
 eval (return t, t, t)()
 ---
-- ['tuple', [1, 2, 3], {'k2': 'v2', 'k1': 'v'}]
-- ['tuple', [1, 2, 3], {'k2': 'v2', 'k1': 'v'}]
-- ['tuple', [1, 2, 3], {'k2': 'v2', 'k1': 'v'}]
+- ["tuple", [1, 2, 3], {"k1": "v", "k2": "v2"}]
+- ["tuple", [1, 2, 3], {"k1": "v", "k2": "v2"}]
+- ["tuple", [1, 2, 3], {"k1": "v", "k2": "v2"}]
 function f(...) return t, t, t end
 ---
 ...
 call f()
 ---
-- ['tuple', [1, 2, 3], {'k2': 'v2', 'k1': 'v'}]
-- ['tuple', [1, 2, 3], {'k2': 'v2', 'k1': 'v'}]
-- ['tuple', [1, 2, 3], {'k2': 'v2', 'k1': 'v'}]
+- ["tuple", [1, 2, 3], {"k1": "v", "k2": "v2"}]
+- ["tuple", [1, 2, 3], {"k1": "v", "k2": "v2"}]
+- ["tuple", [1, 2, 3], {"k1": "v", "k2": "v2"}]
 eval (return {t})()
 ---
-- [['tuple', [1, 2, 3], {'k2': 'v2', 'k1': 'v'}]]
+- [["tuple", [1, 2, 3], {"k1": "v", "k2": "v2"}]]
 function f(...) return {t} end
 ---
 ...
 call f()
 ---
-- [['tuple', [1, 2, 3], {'k2': 'v2', 'k1': 'v'}]]
+- [["tuple", [1, 2, 3], {"k1": "v", "k2": "v2"}]]
 eval (return {t, t, t})()
 ---
-- [['tuple', [1, 2, 3], {'k2': 'v2', 'k1': 'v'}], ['tuple', [1, 2, 3], {'k2': 'v2', 'k1': 'v'}], ['tuple', [1, 2, 3], {'k2': 'v2', 'k1': 'v'}]]
+- [["tuple", [1, 2, 3], {"k1": "v", "k2": "v2"}], ["tuple", [1, 2, 3], {"k1": "v", "k2": "v2"}], ["tuple", [1, 2, 3], {"k1": "v", "k2": "v2"}]]
 function f(...) return {t, t, t} end
 ---
 ...
 call f()
 ---
-- [['tuple', [1, 2, 3], {'k2': 'v2', 'k1': 'v'}], ['tuple', [1, 2, 3], {'k2': 'v2', 'k1': 'v'}], ['tuple', [1, 2, 3], {'k2': 'v2', 'k1': 'v'}]]
+- [["tuple", [1, 2, 3], {"k1": "v", "k2": "v2"}], ["tuple", [1, 2, 3], {"k1": "v", "k2": "v2"}], ["tuple", [1, 2, 3], {"k1": "v", "k2": "v2"}]]
 eval (return error('exception'))()
 ---
 {
@@ -501,79 +501,79 @@ function f(...) return ... end
 call f()
 ---
 
-eval (return ...)(1,2,3)
+eval (return ...)(1, 2, 3)
 ---
 - 1
 - 2
 - 3
 function f(...) return ... end
 ---
 ...
-call f(1,2,3)
+call f(1, 2, 3)
 ---
 - 1
 - 2
 - 3
-eval (return ...)(None,None,None)
+eval (return ...)(null, null, null)
 ---
-- None
-- None
-- None
+- null
+- null
+- null
 function f(...) return ... end
 ---
 ...
-call f(None,None,None)
+call f(null, null, null)
 ---
-- None
-- None
-- None
-eval (return ...)({'k2': 'v2', 'k1': 'v1'})
+- null
+- null
+- null
+eval (return ...)({"k1": "v1", "k2": "v2"})
 ---
-- {'k2': 'v2', 'k1': 'v1'}
+- {"k1": "v1", "k2": "v2"}
 function f(...) return ... end
 ---
 ...
-call f({'k2': 'v2', 'k1': 'v1'})
+call f({"k1": "v1", "k2": "v2"})
 ---
-- {'k2': 'v2', 'k1': 'v1'}
+- {"k1": "v1", "k2": "v2"}
 eval (return space:auto_increment({"transaction"}))()
 ---
-- [1, 'transaction']
+- [1, "transaction"]
 function f(...) return space:auto_increment({"transaction"}) end
 ---
 ...
 call f()
 ---
-- [2, 'transaction']
+- [2, "transaction"]
 eval (return space:select{})()
 ---
-- [[1, 'transaction'], [2, 'transaction']]
+- [[1, "transaction"], [2, "transaction"]]
 function f(...) return space:select{} end
 ---
 ...
 call f()
 ---
-- [[1, 'transaction'], [2, 'transaction']]
+- [[1, "transaction"], [2, "transaction"]]
 eval (return box.begin(), space:auto_increment({"failed"}), box.rollback())()
 ---
-- None
-- [3, 'failed']
+- null
+- [3, "failed"]
 function f(...) return box.begin(), space:auto_increment({"failed"}), box.rollback() end
 ---
 ...
 call f()
 ---
-- None
-- [3, 'failed']
+- null
+- [3, "failed"]
 eval (return space:select{})()
 ---
-- [[1, 'transaction'], [2, 'transaction']]
+- [[1, "transaction"], [2, "transaction"]]
 function f(...) return space:select{} end
 ---
 ...
 call f()
 ---
-- [[1, 'transaction'], [2, 'transaction']]
+- [[1, "transaction"], [2, "transaction"]]
 eval (return require("fiber").sleep(0))()
 ---
 
diff --git a/test/box-py/call.test.py b/test/box-py/call.test.py
@@ -2,6 +2,7 @@
 
 import os
 import sys
+import json
 
 def call(name, *args):
     return iproto.call(name, *args)
@@ -136,16 +137,30 @@ def call(name, *args):
 admin("space = box.schema.space.create('tweedledum')")
 admin("index = space:create_index('primary', { type = 'tree' })")
 
+json_dumps_kwargs=dict(sort_keys=True, separators=(', ', ': '))
+
+def dump_args(*args):
+    return json.dumps(args, **json_dumps_kwargs)[1:-1]
+
+def dump_response(response):
+    if response.return_code:
+        return str(response)
+    if not response.data:
+        return ''
+    res = []
+    for item in response.data:
+        res.append(json.dumps(item, **json_dumps_kwargs))
+    return '- ' + '\n- '.join(res)
 
 def lua_eval(name, *args):
-    print("eval ({})({})".format(name, ",".join([ str(arg) for arg in args])))
+    print("eval ({})({})".format(name, dump_args(*args)))
     print("---")
-    print(iproto.py_con.eval(name, args))
+    print(dump_response(iproto.py_con.eval(name, args)))
 
 def lua_call(name, *args):
-    print("call {}({})".format(name, ",".join([ str(arg) for arg in args])))
+    print("call {}({})".format(name, dump_args(*args)))
     print("---")
-    print(iproto.py_con.call(name, args))
+    print(dump_response(iproto.py_con.call(name, args)))
 
 def test(expr, *args):
     lua_eval("return " + expr, *args)
