qa: s/REQUIRE_MGRS/MGRS_REQUIRED/ for consistency

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

diff --git a/qa/tasks/mgr/mgr_test_case.py b/qa/tasks/mgr/mgr_test_case.py
index 26b0971d65ec2777d76a838a33b7fab9660a2d4d..a5531d33ed2e18079525b2175b33092b390dd48d 100644 (file)
--- a/qa/tasks/mgr/mgr_test_case.py
+++ b/qa/tasks/mgr/mgr_test_case.py
@@ -45,7 +45,7 @@ class MgrCluster(CephCluster):
 
 
 class MgrTestCase(CephTestCase):
-    REQUIRE_MGRS = 1
+    MGRS_REQUIRED = 1
 
     def setUp(self):
         super(MgrTestCase, self).setUp()
@@ -53,10 +53,10 @@ class MgrTestCase(CephTestCase):
         # The test runner should have populated this
         assert self.mgr_cluster is not None
 
-        if len(self.mgr_cluster.mgr_ids) < self.REQUIRE_MGRS:
+        if len(self.mgr_cluster.mgr_ids) < self.MGRS_REQUIRED:
             raise case.SkipTest("Only have {0} manager daemons, "
                                 "{1} are required".format(
-                len(self.mgr_cluster.mgr_ids), self.REQUIRE_MGRS))
+                len(self.mgr_cluster.mgr_ids), self.MGRS_REQUIRED))
 
         # Restart all the daemons
         for daemon in self.mgr_cluster.mgr_daemons.values():

diff --git a/qa/tasks/mgr/test_failover.py b/qa/tasks/mgr/test_failover.py
index e695cf2ed907e7567d656a0840d81531961df47f..c3ac7fb78be6e5baa19a9c2df5a1bc25e531dfa4 100644 (file)
--- a/qa/tasks/mgr/test_failover.py
+++ b/qa/tasks/mgr/test_failover.py
@@ -8,7 +8,7 @@ log = logging.getLogger(__name__)
 
 
 class TestFailover(MgrTestCase):
-    REQUIRE_MGRS = 2
+    MGRS_REQUIRED = 2
 
     def test_timeout(self):
         """

diff --git a/qa/tasks/vstart_runner.py b/qa/tasks/vstart_runner.py
index c59f8222c19792f6803bf2c615a194da0c00fc94..3f1825122e0422ee5a807f9e3132e77f5e905442 100644 (file)
--- a/qa/tasks/vstart_runner.py
+++ b/qa/tasks/vstart_runner.py
@@ -813,7 +813,7 @@ def scan_tests(modules):
         max_required_clients = max(max_required_clients,
                                getattr(case, "CLIENTS_REQUIRED", 0))
         max_required_mgr = max(max_required_mgr,
-                               getattr(case, "REQUIRE_MGRS", 0))
+                               getattr(case, "MGRS_REQUIRED", 0))
 
     return max_required_mds, max_required_clients, max_required_mgr