Merge "Pulls up _test_atomic_action_timer to TestCase"

openstack · Jan 15, 2015 · 721e7d6 · 721e7d6
2 parents be56e1a + 604dd82
commit 721e7d6
Show file tree

Hide file tree

Showing 12 changed files with 6 additions and 55 deletions.
diff --git a/tests/unit/benchmark/scenarios/ceilometer/test_utils.py b/tests/unit/benchmark/scenarios/ceilometer/test_utils.py
@@ -28,11 +28,6 @@ def setUp(self):
         self.scenario.clients = mock.MagicMock(
             return_value=fakes.FakeCeilometerClient())
 
-    def _test_atomic_action_timer(self, atomic_actions_time, name):
-        action_duration = atomic_actions_time.get(name)
-        self.assertIsNotNone(action_duration)
-        self.assertIsInstance(action_duration, float)
-
     def test__list_alarms(self):
         alarm1_id = "fake_alarm1_id"
         alarm2_id = "fake_alarm2_id"

diff --git a/tests/unit/benchmark/scenarios/cinder/test_utils.py b/tests/unit/benchmark/scenarios/cinder/test_utils.py
@@ -41,11 +41,6 @@ def setUp(self):
         self.useFixture(mockpatch.Patch('time.sleep'))
         self.scenario = utils.CinderScenario()
 
-    def _test_atomic_action_timer(self, atomic_actions, name):
-        action_duration = atomic_actions.get(name)
-        self.assertIsNotNone(action_duration)
-        self.assertIsInstance(action_duration, float)
-
     @mock.patch(CINDER_UTILS + '.CinderScenario.clients')
     def test__list_volumes(self, mock_clients):
         volumes_list = mock.Mock()

diff --git a/tests/unit/benchmark/scenarios/designate/test_utils.py b/tests/unit/benchmark/scenarios/designate/test_utils.py
@@ -29,11 +29,6 @@ def setUp(self):
         super(DesignateScenarioTestCase, self).setUp()
         self.domain = mock.Mock()
 
-    def _test_atomic_action_timer(self, atomic_actions_time, name):
-        action_duration = atomic_actions_time.get(name)
-        self.assertIsNotNone(action_duration)
-        self.assertIsInstance(action_duration, float)
-
     @mock.patch(DESIGNATE_UTILS + 'DesignateScenario._generate_random_name')
     @mock.patch(DESIGNATE_UTILS + 'DesignateScenario.clients')
     def test_create_domain(self, mock_clients, mock_random_name):

diff --git a/tests/unit/benchmark/scenarios/glance/test_utils.py b/tests/unit/benchmark/scenarios/glance/test_utils.py
@@ -53,11 +53,6 @@ def test_failed_image_status(self):
                           butils.get_from_manager(),
                           image_manager.create('fails', 'url', 'cf', 'df'))
 
-    def _test_atomic_action_timer(self, atomic_actions, name):
-        action_duration = atomic_actions.get(name)
-        self.assertIsNotNone(action_duration)
-        self.assertIsInstance(action_duration, float)
-
     @mock.patch(GLANCE_UTILS + '.GlanceScenario.clients')
     def test_list_images(self, mock_clients):
         images_list = []

diff --git a/tests/unit/benchmark/scenarios/heat/test_utils.py b/tests/unit/benchmark/scenarios/heat/test_utils.py
@@ -42,11 +42,6 @@ def setUp(self):
         self.useFixture(mockpatch.Patch('time.sleep'))
         self.scenario = utils.HeatScenario()
 
-    def _test_atomic_action_timer(self, atomic_actions, name):
-        action_duration = atomic_actions.get(name)
-        self.assertIsNotNone(action_duration)
-        self.assertIsInstance(action_duration, float)
-
     @mock.patch(HEAT_UTILS + '.HeatScenario.clients')
     def test_list_stacks(self, mock_clients):
         stacks_list = []

diff --git a/tests/unit/benchmark/scenarios/keystone/test_utils.py b/tests/unit/benchmark/scenarios/keystone/test_utils.py
@@ -51,11 +51,6 @@ def test_is_temporary(self):
 
 class KeystoneScenarioTestCase(test.TestCase):
 
-    def _test_atomic_action_timer(self, atomic_actions, name):
-        action_duration = atomic_actions.get(name)
-        self.assertIsNotNone(action_duration)
-        self.assertIsInstance(action_duration, float)
-
     @mock.patch(UTILS + "uuid.uuid4", return_value="pwd")
     @mock.patch(UTILS + "KeystoneScenario._generate_random_name",
                 return_value="abc")

diff --git a/tests/unit/benchmark/scenarios/neutron/test_utils.py b/tests/unit/benchmark/scenarios/neutron/test_utils.py
@@ -29,11 +29,6 @@ def setUp(self):
         super(NeutronScenarioTestCase, self).setUp()
         self.network = mock.Mock()
 
-    def _test_atomic_action_timer(self, atomic_actions_time, name):
-        action_duration = atomic_actions_time.get(name)
-        self.assertIsNotNone(action_duration)
-        self.assertIsInstance(action_duration, float)
-
     @mock.patch(NEUTRON_UTILS + 'NeutronScenario._generate_random_name')
     @mock.patch(NEUTRON_UTILS + 'NeutronScenario.clients')
     def test_create_network(self, mock_clients, mock_random_name):

diff --git a/tests/unit/benchmark/scenarios/nova/test_utils.py b/tests/unit/benchmark/scenarios/nova/test_utils.py
@@ -23,6 +23,7 @@
 from tests.unit import fakes
 from tests.unit import test
 
+
 BM_UTILS = 'rally.benchmark.utils'
 NOVA_UTILS = "rally.benchmark.scenarios.nova.utils"
 CONF = cfg.CONF
@@ -49,11 +50,6 @@ def setUp(self):
         self.gfm = self.get_fm.mock
         self.useFixture(mockpatch.Patch('time.sleep'))
 
-    def _test_atomic_action_timer(self, atomic_actions, name):
-        action_duration = atomic_actions.get(name)
-        self.assertIsNotNone(action_duration)
-        self.assertIsInstance(action_duration, float)
-
     def test_failed_server_status(self):
         self.get_fm.cleanUp()
         server_manager = fakes.FakeFailedServerManager()

diff --git a/tests/unit/benchmark/scenarios/quotas/test_utils.py b/tests/unit/benchmark/scenarios/quotas/test_utils.py
@@ -26,11 +26,6 @@ class QuotasScenarioTestCase(test.TestCase):
     def setUp(self):
         super(QuotasScenarioTestCase, self).setUp()
 
-    def _test_atomic_action_timer(self, atomic_actions_time, name):
-        action_duration = atomic_actions_time.get(name)
-        self.assertIsNotNone(action_duration)
-        self.assertIsInstance(action_duration, float)
-
     def test__update_quotas(self):
         tenant_id = 'fake_tenant'
         quotas = {

diff --git a/tests/unit/benchmark/scenarios/sahara/test_utils.py b/tests/unit/benchmark/scenarios/sahara/test_utils.py
@@ -36,11 +36,6 @@ def setUp(self):
         CONF.set_override("cluster_check_interval", 0, "benchmark")
         CONF.set_override("job_check_interval", 0, "benchmark")
 
-    def _test_atomic_action_timer(self, atomic_actions, name):
-        action_duration = atomic_actions.get(name)
-        self.assertIsNotNone(action_duration)
-        self.assertIsInstance(action_duration, float)
-
     @mock.patch(SAHARA_UTILS + '.SaharaScenario.clients')
     def test_list_node_group_templates(self, mock_clients):
         ngts = []

diff --git a/tests/unit/benchmark/scenarios/zaqar/test_utils.py b/tests/unit/benchmark/scenarios/zaqar/test_utils.py
@@ -23,11 +23,6 @@
 
 class ZaqarScenarioTestCase(test.TestCase):
 
-    def _test_atomic_action_timer(self, atomic_actions, name):
-        action_duration = atomic_actions.get(name)
-        self.assertIsNotNone(action_duration)
-        self.assertIsInstance(action_duration, float)
-
     @mock.patch(UTILS + "ZaqarScenario._generate_random_name",
                 return_value="kitkat")
     def test_queue_create(self, mock_gen_name):

diff --git a/tests/unit/test.py b/tests/unit/test.py
@@ -37,6 +37,11 @@ def setUp(self):
         super(TestCase, self).setUp()
         self.addCleanup(mock.patch.stopall)
 
+    def _test_atomic_action_timer(self, atomic_actions, name):
+        action_duration = atomic_actions.get(name)
+        self.assertIsNotNone(action_duration)
+        self.assertIsInstance(action_duration, float)
+
 
 class DBTestCase(TestCase):
     """Base class for tests which use DB."""