mutest: fix match_step_json to doc and allow objects not just str

Signed-off-by: Christian Hopps <[email protected]>

munet/mutest/userapi.py

@@ -486,6 +486,9 @@ def _match_command_json(
  return expect_fail, {}
 
  try:
+ # Convert to string to validate the input is valid JSON
+ if not isinstance(match, str):
+ match = json.dumps(match)
  expect = json.loads(match)
  except Exception as error:
  expect = {}

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "munet"
-version = "0.13.15"
+version = "0.13.16"
 description = "A package to facilitate network simulations"
 authors = ["Christian Hopps <[email protected]>"]
 license = "GPL-2.0-or-later"

tests/mutest/mutest_matchwait_json.py

@@ -7,7 +7,7 @@
 from munet.mutest.userapi import wait_step_json
 
 
-js = step_json("r1", 'echo { "name": "chopps" }')
+js = step_json("r1", """printf '{ "name": "chopps" }'""")
 log("SIMPLE JSON: %s", js)
 
 # expect passing tests
@@ -201,7 +201,7 @@
 
 json1 = '[{"foo":"foo"}]'
 json2 = '[{"foo":"foo"}, {"bar":"bar"}]'
-json3 = '[{"bar":"bar"}, {"foo":"foo"}]'
+json3 = [{"bar": "bar"}, {"foo": "foo"}]
 
 _, ret = match_step_json(
  "r1",