From deb78542ed45ac402b4492d5b9ae4a9cdf182724 Mon Sep 17 00:00:00 2001 From: John Spray Date: Thu, 2 Nov 2017 07:42:56 -0400 Subject: [PATCH] qa: fix mgr _load_module helper I inadvertently broke this with the latest change to the module ls output. Signed-off-by: John Spray (cherry picked from commit 4fb3025682d812f86c50fa36532290fc0f8857ae) --- qa/tasks/mgr/mgr_test_case.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/qa/tasks/mgr/mgr_test_case.py b/qa/tasks/mgr/mgr_test_case.py index 0734842fa0569..ec3f98d28bb41 100644 --- a/qa/tasks/mgr/mgr_test_case.py +++ b/qa/tasks/mgr/mgr_test_case.py @@ -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 -- 2.39.5