From: Sage Weil <sage@newdream.net>
Date: Tue, 13 Apr 2021 22:47:05 +0000 (-0400)
Subject: qa/tasks/mgr/test_dashboard: skip test_standby if mgr_standby_modules=false
X-Git-Tag: v16.2.5~39^2~4^2^2~42
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=ac20fa7c3bd4e3f9e5cbe682e1ed7914f372e0fa;p=ceph.git

qa/tasks/mgr/test_dashboard: skip test_standby if mgr_standby_modules=false

Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit a2c9333a0b5ed061839aa798f8293c5fcdc6e7f5)
---

diff --git a/qa/tasks/mgr/test_dashboard.py b/qa/tasks/mgr/test_dashboard.py
index b30175f4f6f..c3459ec024d 100644
--- a/qa/tasks/mgr/test_dashboard.py
+++ b/qa/tasks/mgr/test_dashboard.py
@@ -39,6 +39,12 @@ class TestDashboard(MgrTestCase):
         self.wait_until_true(_check_connection, timeout=30)
 
     def test_standby(self):
+        # skip this test if mgr_standby_modules=false
+        if self.mgr_cluster.mon_manager.raw_cluster_cmd(
+                "config", "get", "mgr", "mgr_standby_modules").strip() == "false":
+            log.info("Skipping test_standby since mgr_standby_modules=false")
+            return
+
         original_active_id = self.mgr_cluster.get_active_id()
         original_uri = self._get_uri("dashboard")
         log.info("Originally running manager '{}' at {}".format(