From 4b3f026d077ac9d57a6a1b7f6af733f294878905 Mon Sep 17 00:00:00 2001 From: John Spray Date: Mon, 16 Apr 2018 16:00:39 -0400 Subject: [PATCH] qa: update mgr test for MgrModule.OPTIONS Signed-off-by: John Spray --- qa/tasks/mgr/test_module_selftest.py | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/qa/tasks/mgr/test_module_selftest.py b/qa/tasks/mgr/test_module_selftest.py index 63531fd5effa3..21aa4a3d232d4 100644 --- a/qa/tasks/mgr/test_module_selftest.py +++ b/qa/tasks/mgr/test_module_selftest.py @@ -133,6 +133,11 @@ class TestModuleSelftest(MgrTestCase): self.mgr_cluster.mon_manager.raw_cluster_cmd( "config-key", "set", "mgr/selftest/testnewline", "foo\nbar") + # Inject configuration setting that does not appear in the + # module's config schema + self.mgr_cluster.mon_manager.raw_cluster_cmd( + "config-key", "set", "mgr/selftest/kvitem", "foo\nbar") + # Bring mgr daemons back online, the one that goes active # should be doing the upgrade. for mgr_id in self.mgr_cluster.mgr_daemons.keys(): @@ -149,9 +154,12 @@ class TestModuleSelftest(MgrTestCase): seen_keys = [k for s,k,v in get_config()] self.assertIn("mgr/selftest/testkey", seen_keys) - # And that the non-config-looking one isn't + # ...and that the non-config-looking one isn't self.assertNotIn("mgr/selftest/testnewline", seen_keys) + # ...and that the not-in-schema one isn't + self.assertNotIn("mgr/selftest/kvitem", seen_keys) + # Restore previous configuration for subsys, key, value in stash: self.mgr_cluster.mon_manager.raw_cluster_cmd( -- 2.39.5