import quincy beta 17.1.0

[ceph.git] / ceph / qa / tasks / mgr / mgr_test_case.py

diff --git a/ceph/qa/tasks/mgr/mgr_test_case.py b/ceph/qa/tasks/mgr/mgr_test_case.py
index f5392d3ba38a33ac25e7aa68dc77f835036ac25f..5fe5e0759856cb269f309e50a4f271a2b5a4d8cb 100644 (file)
--- a/ceph/qa/tasks/mgr/mgr_test_case.py
+++ b/ceph/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