Merge lp:~veebers/juju-ci-tools/migration-log-check-fix into lp:juju-ci-tools

[Christopher Lee]

Fix for log migration test so it checks all previous logs.

Withou --replay the logs returned might not include the logs in the
timeframe that we're interested in.

[Curtis Hovey (sinzui)]

Thank you for fixing this intermittent failure.

review: Approve (code)

[lp:~veebers/juju-ci-tools/migration-log-check-fix]

1813. By Christopher Lee on 2016-12-21

Merged model-migration-remove-mongo into migration-log-check-fix.

=== modified file 'assess_model_migration.py'
--- assess_model_migration.py	2016-12-21 21:50:59 +0000
+++ assess_model_migration.py	2016-12-21 21:50:59 +0000
@@ -47,6 +47,7 @@
             dest_client = bs2.client
             ensure_migration_including_resources_succeeds(
                 source_client, dest_client)
+            ensure_model_logs_are_migrated(source_client, dest_client)
             with temp_dir() as temp:
                 ensure_migrating_with_insufficient_user_permissions_fails(
                     source_client, dest_client, temp)
@@ -59,7 +60,6 @@
                         source_client, dest_client, temp)
 
             if args.use_develop:
-                ensure_model_logs_are_migrated(source_client, dest_client)
                 ensure_migration_rolls_back_on_failure(
                     source_client, dest_client)
                 ensure_api_login_redirects(source_client, dest_client)
@@ -372,7 +372,7 @@
     log.info('Attempting migration process')
     migrated_model = migrate_model_to_controller(new_model_client, dest_client)
     after_migration_logs = migrated_model.get_juju_output(
-        'debug-log', '--no-tail', '-l', 'DEBUG')
+        'debug-log', '--no-tail', '--replay', '-l', 'DEBUG')
     if before_migration_logs not in after_migration_logs:
         raise JujuAssertionError('Logs failed to be migrated.')
     log.info('SUCCESS: logs migrated.')

=== modified file 'tests/test_assess_model_migration.py'
--- tests/test_assess_model_migration.py	2016-12-21 21:50:59 +0000
+++ tests/test_assess_model_migration.py	2016-12-21 21:50:59 +0000
@@ -710,6 +710,10 @@
     yield '/tmp/dir'
 
 
+def patch_amm(target):
+    return patch.object(amm, target, autospec=True)
+
+
 class TestAssessModelMigration(TestCase):
 
     def test_runs_develop_tests_when_requested(self):
@@ -721,9 +725,6 @@
         bs1.booted_context.return_value = noop_context()
         bs2.existing_booted_context.return_value = noop_context()
 
-        def patch_amm(target):
-            return patch.object(amm, target, autospec=True)
-
         patch_between = patch_amm(
             'ensure_migration_including_resources_succeeds')
         patch_user = patch_amm(
@@ -768,30 +769,29 @@
         bs1.booted_context.return_value = noop_context()
         bs2.existing_booted_context.return_value = noop_context()
 
-        with patch.object(
-                amm,
-                'ensure_migrating_with_insufficient_user_permissions_fails',
-                autospec=True) as m_user:
-            with patch.object(
-                    amm,
-                    'ensure_migrating_with_superuser_user_permissions_succeeds',  # NOQA
-                    autospec=True) as m_super:
-                with patch.object(
-                        amm,
-                        'ensure_migration_including_resources_succeeds',
-                        autospec=True) as m_between:
-                    with patch.object(
-                            amm,
-                            'ensure_migration_rolls_back_on_failure',
-                            autospec=True) as m_rollback:
-                        with patch.object(
-                                amm, 'temp_dir',
-                                autospec=True, return_value=tmp_ctx()):
-                            amm.assess_model_migration(bs1, bs2, args)
+        patch_user = patch_amm(
+            'ensure_migrating_with_insufficient_user_permissions_fails')
+        patch_super = patch_amm(
+            'ensure_migrating_with_superuser_user_permissions_succeeds')
+        patch_between = patch_amm(
+            'ensure_migration_including_resources_succeeds')
+        patch_rollback = patch_amm('ensure_migration_rolls_back_on_failure')
+        patch_logs = patch_amm('ensure_model_logs_are_migrated')
+
+        with patch_user as m_user:
+            with patch_super as m_super:
+                with patch_between as m_between:
+                    with patch_rollback as m_rollback:
+                        with patch_logs as m_logs:
+                            with patch.object(
+                                    amm, 'temp_dir',
+                                    autospec=True, return_value=tmp_ctx()):
+                                amm.assess_model_migration(bs1, bs2, args)
         source_client = bs1.client
         dest_client = bs2.client
         m_user.assert_called_once_with(source_client, dest_client, '/tmp/dir')
         m_super.assert_called_once_with(source_client, dest_client, '/tmp/dir')
         m_between.assert_called_once_with(source_client, dest_client)
+        m_logs.assert_called_once_with(source_client, dest_client)
 
         self.assertEqual(m_rollback.call_count, 0)