From ea15b625f3fcb2c53e400ef00e1a841e9919d13d Mon Sep 17 00:00:00 2001 From: Noah Watkins Date: Tue, 28 Aug 2018 13:45:56 -0700 Subject: [PATCH] qa/mgr/selftest: handle always-on module fall out need a non-always-on module. hello doesn't work because it isn't installed. so switch to selftest. Signed-off-by: Noah Watkins --- qa/tasks/mgr/test_module_selftest.py | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/qa/tasks/mgr/test_module_selftest.py b/qa/tasks/mgr/test_module_selftest.py index 3851a5be86725..30968118f8226 100644 --- a/qa/tasks/mgr/test_module_selftest.py +++ b/qa/tasks/mgr/test_module_selftest.py @@ -231,15 +231,14 @@ class TestModuleSelftest(MgrTestCase): disabled/failed/recently-enabled modules. """ - self._load_module("selftest") - # Calling a command on a disabled module should return the proper # error code. + self._load_module("selftest") self.mgr_cluster.mon_manager.raw_cluster_cmd( - "mgr", "module", "disable", "hello") + "mgr", "module", "disable", "selftest") with self.assertRaises(CommandFailedError) as exc_raised: self.mgr_cluster.mon_manager.raw_cluster_cmd( - "hello") + "mgr", "self-test", "run") self.assertEqual(exc_raised.exception.exitstatus, errno.EOPNOTSUPP) @@ -252,9 +251,9 @@ class TestModuleSelftest(MgrTestCase): # Enabling a module and then immediately using ones of its commands # should work (#21683) + self._load_module("selftest") self.mgr_cluster.mon_manager.raw_cluster_cmd( - "mgr", "module", "enable", "status") - self.mgr_cluster.mon_manager.raw_cluster_cmd("osd", "status") + "mgr", "self-test", "config", "get", "testkey") # Calling a command for a failed module should return the proper # error code. -- 2.39.5