Fix bug in wait_for_ready, add tests

CrackerJackMack · CrackerJackMack · commit 624044c6c7a3 · 2013-12-17T17:28:13.000-06:00
diff --git a/SoftLayer/managers/cci.py b/SoftLayer/managers/cci.py
@@ -367,7 +367,7 @@ def wait_for_ready(self, instance_id, limit, delay=1, pending=False):
         :param bool pending: Wait for pending transactions not related to
                              provisioning or reloads such as monitoring.
         """
-        for count, new_instance in enumerate(repeat(instance_id)):
+        for count, new_instance in enumerate(repeat(instance_id), start=1):
             instance = self.get_instance(new_instance)
             last_reload = lookup(instance, 'lastOperatingSystemReload', 'id')
             active_transaction = lookup(instance, 'activeTransaction', 'id')
diff --git a/SoftLayer/tests/managers/cci_tests.py b/SoftLayer/tests/managers/cci_tests.py
@@ -502,20 +502,111 @@ def test_generate_multi_disk(self):
         self.assertTrue(data.get('blockDevices'))
         self.assertEqual(data['blockDevices'], assert_data['blockDevices'])
 
+    @patch('SoftLayer.managers.cci.CCIManager.wait_for_ready')
+    def test_wait(self, ready):
+        # verify interface to wait_for_ready is intact
+        self.cci.wait_for_transaction(1, 1)
+        ready.assert_called_once_with(1, 1, delay=1, pending=True)
+
+    def test_ready_permutations(self):
+        guestObject = self.client['Virtual_Guest'].getObject
+
+        # active transaction and no provision date should be false
+        guestObject.side_effect = [
+            {'activeTransaction': {'id': 1}},
+        ]
+        value = self.cci.wait_for_ready(1, 1)
+        self.assertFalse(value)
+        guestObject.reset_mock()
+
+        # active transaction and provision date should be True
+        guestObject.side_effect = [
+            {'activeTransaction': {'id': 1},
+             'provisionDate': 'aaa'},
+        ]
+        value = self.cci.wait_for_ready(1, 1)
+        self.assertTrue(value)
+        guestObject.reset_mock()
+
+        # active transaction and provision date
+        # and pending should be false
+        guestObject.side_effect = [
+            {'activeTransaction': {'id': 1},
+             'provisionDate': 'aaa'},
+        ]
+        value = self.cci.wait_for_ready(1, 1, pending=True)
+        self.assertFalse(value)
+        guestObject.reset_mock()
+
+        # actively running reload
+        guestObject.side_effect = [
+            {
+                'activeTransaction': {'id': 1},
+                'provisionDate': 'aaa',
+                'lastOperatingSystemReload': {'id': 1},
+            },
+        ]
+        value = self.cci.wait_for_ready(1, 1)
+        self.assertFalse(value)
+        guestObject.reset_mock()
+
+        # reload complete, maintance transactions
+        guestObject.side_effect = [
+            {
+                'activeTransaction': {'id': 2},
+                'provisionDate': 'aaa',
+                'lastOperatingSystemReload': {'id': 1},
+            },
+        ]
+        value = self.cci.wait_for_ready(1, 1)
+        self.assertTrue(value)
+        guestObject.reset_mock()
+
+        # reload complete, pending maintance transactions
+        guestObject.side_effect = [
+            {
+                'activeTransaction': {'id': 2},
+                'provisionDate': 'aaa',
+                'lastOperatingSystemReload': {'id': 1},
+            },
+        ]
+        value = self.cci.wait_for_ready(1, 1, pending=True)
+        self.assertFalse(value)
+        guestObject.reset_mock()
+
     @patch('SoftLayer.managers.cci.sleep')
-    def test_wait(self, _sleep):
+    def test_ready_delay_iterations(self, _sleep):
         guestObject = self.client['Virtual_Guest'].getObject
 
+        # no iteration, false
+        guestObject.side_effect = [
+            {'activeTransaction': {'id': 1}},
+        ]
+        value = self.cci.wait_for_ready(1, 1)
+        self.assertFalse(value)
+        self.assertFalse(_sleep.called)
+        _sleep.reset_mock()
+        guestObject.reset_mock()
+
+        # no iteration, true
+        guestObject.side_effect = [
+            {'provisionDate': 'aaa'},
+        ]
+        value = self.cci.wait_for_ready(1, 1)
+        self.assertTrue(value)
+        self.assertFalse(_sleep.called)
+        _sleep.reset_mock()
+        guestObject.reset_mock()
+
         # test 4 iterations with positive match
         guestObject.side_effect = [
             {'activeTransaction': {'id': 1}},
             {'activeTransaction': {'id': 1}},
             {'activeTransaction': {'id': 1}},
             {'provisionDate': 'aaa'},
-            {'provisionDate': 'aaa'}
         ]
 
-        value = self.cci.wait_for_transaction(1, 4)
+        value = self.cci.wait_for_ready(1, 4)
         self.assertTrue(value)
         _sleep.assert_has_calls([call(1), call(1), call(1)])
         guestObject.assert_has_calls([
@@ -528,17 +619,15 @@ def test_wait(self, _sleep):
         guestObject.reset_mock()
 
         guestObject.side_effect = [
-            {'activeTransaction': {'id': 1}},
             {'activeTransaction': {'id': 1}},
             {'activeTransaction': {'id': 1}},
             {'provisionDate': 'aaa'}
         ]
-        value = self.cci.wait_for_transaction(1, 2)
+        value = self.cci.wait_for_ready(1, 2)
         self.assertFalse(value)
-        _sleep.assert_has_calls([call(1), call(1)])
+        _sleep.assert_called_once_with(1)
         guestObject.assert_has_calls([
             call(id=1, mask=ANY), call(id=1, mask=ANY),
-            call(id=1, mask=ANY)
         ])
 
         # 10 iterations at 10 second sleeps with no
@@ -556,21 +645,21 @@ def test_wait(self, _sleep):
             {'activeTransaction': {'id': 1}},
             {'activeTransaction': {'id': 1}},
             {'activeTransaction': {'id': 1}},
-            {'activeTransaction': {'id': 1}}
         ]
-        value = self.cci.wait_for_transaction(1, 10, 10)
+        value = self.cci.wait_for_ready(1, 10, 10)
         self.assertFalse(value)
         guestObject.assert_has_calls([
             call(id=1, mask=ANY), call(id=1, mask=ANY),
             call(id=1, mask=ANY), call(id=1, mask=ANY),
             call(id=1, mask=ANY), call(id=1, mask=ANY),
             call(id=1, mask=ANY), call(id=1, mask=ANY),
             call(id=1, mask=ANY), call(id=1, mask=ANY),
-            call(id=1, mask=ANY)
         ])
+        # should only be 9 calls to sleep, last iteration
+        # should return a value and skip the sleep
         _sleep.assert_has_calls([
             call(10), call(10), call(10), call(10), call(10),
-            call(10), call(10), call(10), call(10), call(10)])
+            call(10), call(10), call(10), call(10)])
 
     def test_change_port_speed_public(self):
         cci_id = 1
