Fix: tests: add cli/params/test_params to Makefile and fix it

[babeltrace.git] / tests / data / cli / params / bt_plugin_params.py

diff --git a/tests/data/cli/params/bt_plugin_params.py b/tests/data/cli/params/bt_plugin_params.py
index 6b60889645a624b150c8067dbc134d08b97deffb..63c655b0e74be0fd1ca1edbcdb22c7fbed1138a6 100644 (file)
--- a/tests/data/cli/params/bt_plugin_params.py
+++ b/tests/data/cli/params/bt_plugin_params.py
@@ -24,17 +24,29 @@ def to_string(p):
     # additional information (u suffix to differentiate unsigned integers from
     # signed integers).
 
-    if type(p) is bt2.ArrayValue:
+    if type(p) is bt2._ArrayValueConst:
         s = '[{}]'.format(', '.join([to_string(x) for x in p]))
-    elif type(p) is bt2.MapValue:
+    elif type(p) is bt2._MapValueConst:
         s = '{{{}}}'.format(
             ', '.join([k + '=' + to_string(p[k]) for k in sorted(p.keys())])
         )
-    elif type(p) is bt2.UnsignedIntegerValue:
+    elif type(p) is bt2._UnsignedIntegerValueConst:
         s = str(p) + 'u'
-    else:
+    elif (
+        type(p)
+        in (
+            bt2._StringValueConst,
+            bt2._SignedIntegerValueConst,
+            bt2._RealValueConst,
+            bt2._BoolValueConst,
+        )
+        or p is None
+    ):
         s = str(p)
 
+    else:
+        raise TypeError('Unexpected type', type(p))
+
     return s