From 8c16723fcaf04f6cc2dc17b758a2486e96a2e65e Mon Sep 17 00:00:00 2001 From: Jim Rollenhagen Date: Tue, 24 Jul 2018 13:12:22 +0000 Subject: [PATCH] Simplify hash ring tests Move use_groups to a class-level variable so we don't need to re-implement setUp in the subclass. Change-Id: Ia7e508899e0db47bf4800f8411e02ebd21c62ffd --- ironic/tests/unit/common/test_hash_ring.py | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/ironic/tests/unit/common/test_hash_ring.py b/ironic/tests/unit/common/test_hash_ring.py index 72b66cf09be..c87203cca68 100644 --- a/ironic/tests/unit/common/test_hash_ring.py +++ b/ironic/tests/unit/common/test_hash_ring.py @@ -26,10 +26,12 @@ CONF = cfg.CONF class HashRingManagerTestCase(db_base.DbTestCase): + use_groups = False + def setUp(self): super(HashRingManagerTestCase, self).setUp() - self.use_groups = False - self.ring_manager = hash_ring.HashRingManager(use_groups=False) + self.ring_manager = hash_ring.HashRingManager( + use_groups=self.use_groups) def register_conductors(self): c1 = self.dbapi.register_conductor({ @@ -111,10 +113,7 @@ class HashRingManagerTestCase(db_base.DbTestCase): class HashRingManagerWithGroupsTestCase(HashRingManagerTestCase): - def setUp(self): - super(HashRingManagerWithGroupsTestCase, self).setUp() - self.ring_manager = hash_ring.HashRingManager(use_groups=True) - self.use_groups = True + use_groups = True def test_hash_ring_manager_hardware_type_success(self): self.register_conductors()