From bb0a39b7d953bf05eef8d24ba4efb7a3ead3c17b Mon Sep 17 00:00:00 2001 From: Laura Flores Date: Thu, 14 Oct 2021 23:59:47 +0000 Subject: [PATCH] qa/tasks/mgr: update tests that use `mgr module ls` to specify the json format Signed-off-by: Laura Flores --- qa/tasks/mgr/mgr_test_case.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/qa/tasks/mgr/mgr_test_case.py b/qa/tasks/mgr/mgr_test_case.py index f5392d3ba38..5fe5e075985 100644 --- a/qa/tasks/mgr/mgr_test_case.py +++ b/qa/tasks/mgr/mgr_test_case.py @@ -74,7 +74,7 @@ class MgrTestCase(CephTestCase): # Unload all non-default plugins loaded = json.loads(cls.mgr_cluster.mon_manager.raw_cluster_cmd( - "mgr", "module", "ls"))['enabled_modules'] + "mgr", "module", "ls", "--format=json-pretty"))['enabled_modules'] unload_modules = set(loaded) - {"cephadm", "restful"} for m in unload_modules: @@ -111,7 +111,7 @@ class MgrTestCase(CephTestCase): def _unload_module(cls, module_name): def is_disabled(): enabled_modules = json.loads(cls.mgr_cluster.mon_manager.raw_cluster_cmd( - 'mgr', 'module', 'ls'))['enabled_modules'] + 'mgr', 'module', 'ls', "--format=json-pretty"))['enabled_modules'] return module_name not in enabled_modules if is_disabled(): @@ -124,7 +124,7 @@ class MgrTestCase(CephTestCase): @classmethod def _load_module(cls, module_name): loaded = json.loads(cls.mgr_cluster.mon_manager.raw_cluster_cmd( - "mgr", "module", "ls"))['enabled_modules'] + "mgr", "module", "ls", "--format=json-pretty"))['enabled_modules'] if module_name in loaded: # The enable command is idempotent, but our wait for a restart # isn't, so let's return now if it's already loaded -- 2.47.3