]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
qa: fix mgr _load_module helper
authorJohn Spray <john.spray@redhat.com>
Thu, 2 Nov 2017 11:42:56 +0000 (07:42 -0400)
committerJohn Spray <john.spray@redhat.com>
Thu, 2 Nov 2017 11:42:56 +0000 (07:42 -0400)
I inadvertently broke this with the latest change
to the module ls output.

Signed-off-by: John Spray <john.spray@redhat.com>
qa/tasks/mgr/mgr_test_case.py

index 0734842fa056957ebc4bb9557a5a76cdf55be303..ec3f98d28bb41398451353cfd91759309c2000b6 100644 (file)
@@ -89,7 +89,8 @@ class MgrTestCase(CephTestCase):
             timeout=20)
 
     def _load_module(self, module_name):
-        loaded = json.loads(self.mgr_cluster.mon_manager.raw_cluster_cmd("mgr", "module", "ls"))
+        loaded = json.loads(self.mgr_cluster.mon_manager.raw_cluster_cmd(
+                   "mgr", "module", "ls"))['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