Merge lp:~sseman/juju-ci-tools/update-calls-to-dumps_logs into lp:juju-ci-tools

[Seman]

Since the dump_log() signature has been changed, this branch updates calls to the function.

[Curtis Hovey (sinzui)]

Thank you.

review: Approve (code)

=== modified file 'assess_heterogeneous_control.py'
--- assess_heterogeneous_control.py	2015-06-22 00:14:18 +0000
+++ assess_heterogeneous_control.py	2015-07-29 20:26:13 +0000
@@ -51,7 +51,7 @@
         try:
             yield
         finally:
-            dump_logs(client, host, log_dir)
+            dump_logs(client.env, host, log_dir)
     except:
         client.destroy_environment()
         raise

=== modified file 'deploy_stack.py'
--- deploy_stack.py	2015-07-29 17:11:42 +0000
+++ deploy_stack.py	2015-07-29 20:26:13 +0000
@@ -414,7 +414,7 @@
                     client.bootstrap(upload_tools)
             except:
                 if host is not None and sys.platform != 'win32':
-                    dump_logs(client, host, log_dir, bootstrap_id)
+                    dump_logs(client.env, host, log_dir, bootstrap_id)
                 raise
             try:
                 if host is None:

=== modified file 'test_deploy_stack.py'
--- test_deploy_stack.py	2015-07-29 17:11:42 +0000
+++ test_deploy_stack.py	2015-07-29 20:26:13 +0000
@@ -738,7 +738,7 @@
             with boot_context('bar', client, 'baz', [], None, None, None,
                               'log_dir', keep_env=False, upload_tools=True):
                 pass
-        dl_mock.assert_called_once_with(client, 'baz', 'log_dir', None)
+        dl_mock.assert_called_once_with(client.env, 'baz', 'log_dir', None)
 
 
 class TestDeployJobParseArgs(TestCase):