Merge lp:~abentley/workspace-runner/enhanced-artifacts into lp:workspace-runner

[Aaron Bentley]

Upload artifacts script after command, customize temp dir name.

This branch tweaks the order of operation so that the upload_artifacts script is run after the main command. That way, if the main command deletes the contents of the workspace, the artifacts are still archived successfully.

run-deploy-job is an example of a command that deletes the contents of the workspace. It uses jujuci.py setup-workspace.

This branch also fixes some lint, and specifies the prefix for temp directory names.

[Curtis Hovey (sinzui)]

Thank you.

review: Approve (code)

=== modified file 'workspace_runner/__init__.py'
--- workspace_runner/__init__.py	2015-07-13 14:39:40 +0000
+++ workspace_runner/__init__.py	2015-07-17 14:10:33 +0000
@@ -1,7 +1,6 @@
 from argparse import ArgumentParser
 from ConfigParser import RawConfigParser
 from contextlib import contextmanager
-from itertools import chain
 import json
 import logging
 from pipes import quote
@@ -144,7 +143,7 @@
         logging.info('Remote mktmp')
         return cls.run_python(ssh_connection, dedent("""
             import tempfile
-            print tempfile.mkdtemp()
+            print tempfile.mkdtemp(prefix='workspace-runner-')
             """))
 
     def destroy(self):
@@ -234,6 +233,7 @@
     """Install the files and run the command."""
     for target, sources in config['install'].items():
         primitives.install(sources, target)
+    primitives.run(config['command'], output)
     if 'artifacts' in config:
         import upload_artifacts
         sources = [upload_artifacts.__file__.replace('.pyc', '.py')]
@@ -246,8 +246,6 @@
         with temp_config(upload_config) as upload_config_filename:
             sources.append(upload_config_filename)
             primitives.install(sources, '.wsr')
-    primitives.run(config['command'], output)
-    if 'artifacts' in config:
         primitives.run(['python', '.wsr/upload_artifacts.py',
                         '.wsr/upload.json', primitives.workspace], output)
 
 
=== modified file 'workspace_runner/tests/__init__.py'
--- workspace_runner/tests/__init__.py	2015-07-13 14:39:40 +0000
+++ workspace_runner/tests/__init__.py	2015-07-17 14:10:33 +0000
@@ -248,7 +248,7 @@
             stdout=subprocess.PIPE)
         sp_mock.return_value.communicate.assert_called_once_with(dedent("""
             import tempfile
-            print tempfile.mkdtemp()
+            print tempfile.mkdtemp(prefix='workspace-runner-')
             """))
 
     @contextmanager
@@ -426,6 +426,36 @@
                 'upload.json', 'upload_artifacts.py'])
             ])
 
+    def test_upload_after_delete(self):
+
+        class FakePrimitivesNoUpload(FakePrimitives):
+
+            def run(self_, args, out_file):
+                if args == ['run', 'this']:
+                    self.assertFalse(
+                        os.path.exists(os.path.join(self_.workspace, '.wsr')))
+                return super(FakePrimitivesNoUpload, self_).run(args, out_file)
+
+        config = {
+            'command': ['run', 'this'],
+            'install': {},
+            'artifacts': {'foo': ['bar']},
+            'bucket': 'baz',
+            }
+        with workspace_context('foo', None,
+                               FakePrimitivesNoUpload) as primitives:
+            run_from_config(primitives, config, {}, None, StringIO())
+        self.assertEqual(primitives.run_calls, [
+            ['run', 'this'],
+            ['python', '.wsr/upload_artifacts.py', '.wsr/upload.json',
+             primitives.workspace]
+            ])
+        self.assertEqual(primitives.walk_results, [
+            (primitives.workspace, ['.wsr'], []),
+            (os.path.join(primitives.workspace, '.wsr'), [], [
+                'upload.json', 'upload_artifacts.py'])
+            ])
+
 
 class TestWorkspaceRun(TestCase):