From: John Spray <john.spray@redhat.com>
Date: Mon, 16 Apr 2018 20:00:39 +0000 (-0400)
Subject: qa: update mgr test for MgrModule.OPTIONS
X-Git-Tag: v13.1.0~143^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=4b3f026d077ac9d57a6a1b7f6af733f294878905;p=ceph.git

qa: update mgr test for MgrModule.OPTIONS

Signed-off-by: John Spray <john.spray@redhat.com>
---

diff --git a/qa/tasks/mgr/test_module_selftest.py b/qa/tasks/mgr/test_module_selftest.py
index 63531fd5effa..21aa4a3d232d 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(