Merge lp:~veebers/juju-ci-tools/modelmig-public-cloud-wait-for-model into lp:juju-ci-tools

[Christopher Lee]

Ignore 'cannot find model details' error when listing models.

Ignore 'cannot find model details' error when listing models.

The model has been migrated and the code is waiting for the model to be removed from the list of models. This error occurs sometimes when listing.

[lp:~veebers/juju-ci-tools/modelmig-public-cloud-wait-for-model]

1898. By Christopher Lee on 2017-02-21

Reduce exception logic.

1899. By Christopher Lee on 2017-02-21

Merge trunk

[Aaron Bentley (abentley)]

Thanks.

review: Approve

=== modified file 'assess_model_migration.py'
--- assess_model_migration.py	2017-02-19 21:51:40 +0000
+++ assess_model_migration.py	2017-02-21 22:06:00 +0000
@@ -158,11 +158,13 @@
         except CalledProcessError as e:
             # It's possible that we've tried to get status from the model as
             # it's being removed.
-            if 'cannot get model details' in e.stderr:
+            # We can't consider the model gone yet until we don't get this
+            # error and the model is no longer in the output.
+            if 'cannot get model details' not in e.stderr:
+                raise
+        else:
+            if model_name not in [m['name'] for m in models['models']]:
                 return True
-            raise
-        if model_name not in [m['name'] for m in models['models']]:
-            return True
 
     try:
         _wait_for_model_check(client, model_check, timeout)

=== modified file 'tests/test_assess_model_migration.py'
--- tests/test_assess_model_migration.py	2017-02-17 00:46:09 +0000
+++ tests/test_assess_model_migration.py	2017-02-21 22:06:00 +0000
@@ -512,6 +512,35 @@
                 amm.wait_until_model_disappears(
                     mock_client, 'test_model', timeout=60)
 
+    def test_ignores_model_detail_exceptions(self):
+        """ignore errors for model details as this might happen many times."""
+        mock_client = _get_time_noop_mock_client()
+        model_data = {'models': [{'name': ''}]}
+
+        exp = CalledProcessError(-1, 'blah')
+        exp.stderr = 'cannot get model details'
+        controller_client = Mock()
+        controller_client.get_models.side_effect = [
+            exp,
+            model_data]
+        mock_client.get_controller_client.return_value = controller_client
+        with patch.object(amm, 'sleep') as mock_sleep:
+            amm.wait_until_model_disappears(
+                mock_client, 'test_model', timeout=60)
+            mock_sleep.assert_called_once_with(1)
+
+    def test_fails_on_non_expected_exception(self):
+        mock_client = _get_time_noop_mock_client()
+
+        exp = CalledProcessError(-1, 'blah')
+        exp.stderr = '"" is not a valid tag'
+        controller_client = Mock()
+        controller_client.get_models.side_effect = [exp]
+        mock_client.get_controller_client.return_value = controller_client
+        with self.assertRaises(CalledProcessError):
+            amm.wait_until_model_disappears(
+                mock_client, 'test_model', timeout=60)
+
 
 class TestWaitForModel(TestCase):