qa: s/REQUIRE_MGRS/MGRS_REQUIRED/ for consistency

Signed-off-by: John Spray <john.spray@redhat.com>
This commit is contained in:
John Spray 2017-04-15 12:55:51 -04:00
parent 636fc40d90
commit f695a0e30f
3 changed files with 5 additions and 5 deletions

View File

@ -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():

View File

@ -8,7 +8,7 @@ log = logging.getLogger(__name__)
class TestFailover(MgrTestCase):
REQUIRE_MGRS = 2
MGRS_REQUIRED = 2
def test_timeout(self):
"""

View File

@ -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