Merge lp:~abentley/juju-ci-tools/industrial-test-hotfix into lp:juju-ci-tools

[Aaron Bentley]

Fix two industrial tests bugs.

Fix bugs 1624376 and 1624384.

This gives Joyent 2.5x as much time to start machines. It uses restore_backup correctly, instead of treating it as a context manager.

[Curtis Hovey (sinzui)]

Thank you

review: Approve (code)

=== modified file 'industrial_test.py'
--- industrial_test.py	2016-09-15 15:00:11 +0000
+++ industrial_test.py	2016-09-19 21:22:15 +0000
@@ -731,7 +731,13 @@
                 application_names.append(application)
         timeout_start = datetime.now()
         yield results
-        status = client.wait_for_started(start=timeout_start)
+        # Joyent needs longer to deploy so many containers (bug #1624384).
+        if client.env.config['type'] == 'joyent':
+            deploy_many_timeout = 3000
+        else:
+            deploy_many_timeout = 1200
+        status = client.wait_for_started(deploy_many_timeout,
+                                         start=timeout_start)
         results['result'] = True
         yield results
         results = {'test_id': 'remove-machine-many-container'}
@@ -789,8 +795,8 @@
             wait_for_state_server_to_shutdown(
                 host, controller_client, instance_id)
             yield results
-            with controller_client.restore_backup(backup_file):
-                yield results
+            controller_client.restore_backup(backup_file)
+            yield results
         finally:
             os.unlink(backup_file)
         with wait_for_started(controller_client):