test_heat: don't waste 2 seconds in unittest 95/37595/1
authorRoss Brattain <ross.b.brattain@intel.com>
Fri, 14 Jul 2017 06:05:45 +0000 (23:05 -0700)
committerRoss Brattain <ross.b.brattain@intel.com>
Mon, 17 Jul 2017 03:33:23 +0000 (20:33 -0700)
remove duration checks and test with sleep 0

Change-Id: I22516cde56ac3a02358ca9c3e652cead10580d76
Signed-off-by: Ross Brattain <ross.b.brattain@intel.com>
tests/unit/orchestrator/test_heat.py

index 3dc8ad7..19d91c6 100644 (file)
@@ -183,7 +183,7 @@ class HeatTemplateTestCase(unittest.TestCase):
     @mock_patch_target_module('op_utils')
     @mock_patch_target_module('heatclient.client.Client')
     def test_create_negative(self, mock_heat_client_class, mock_op_utils):
-        self.template.HEAT_WAIT_LOOP_INTERVAL = interval = 0.2
+        self.template.HEAT_WAIT_LOOP_INTERVAL = 0
         mock_heat_client = mock_heat_client_class()  # get the constructed mock
 
         # populate attributes of the constructed mock
@@ -196,15 +196,10 @@ class HeatTemplateTestCase(unittest.TestCase):
 
         with mock.patch.object(self.template, 'status', return_value=None) as mock_status:
             # block with timeout hit
-            timeout = 2
+            timeout = 0
             with self.assertRaises(RuntimeError) as raised, timer() as time_data:
                 self.template.create(block=True, timeout=timeout)
 
-            # ensure runtime is approximately the timeout value
-            expected_time_low = timeout - interval * 0.2
-            expected_time_high = timeout + interval * 0.2
-            self.assertTrue(expected_time_low < time_data['delta'] < expected_time_high)
-
             # ensure op_utils was used
             expected_op_utils_usage += 1
             self.assertEqual(mock_op_utils.get_session.call_count, expected_op_utils_usage)
@@ -232,11 +227,6 @@ class HeatTemplateTestCase(unittest.TestCase):
             with self.assertRaises(RuntimeError) as raised, timer() as time_data:
                 self.template.create(block=True, timeout=timeout)
 
-            # ensure runtime is approximately two intervals
-            expected_time_low = interval * 1.8
-            expected_time_high = interval * 2.2
-            self.assertTrue(expected_time_low < time_data['delta'] < expected_time_high)
-
             # ensure the existing heat_client was used and op_utils was used again
             self.assertEqual(mock_op_utils.get_session.call_count, expected_op_utils_usage)
             self.assertEqual(mock_op_utils.get_endpoint.call_count, expected_op_utils_usage)