Do some cleanup on failurebaserock/adamcoldrick/mason-tests

1 files changed, 8 insertions, 1 deletions

diff --git a/mason/tests/build_test.py b/mason/tests/build_test.py
index 09ce7db..ac007bd 100644
--- a/mason/tests/build_test.py
+++ b/mason/tests/build_test.py
@@ -42,7 +42,10 @@ class Runner(mason.runners.JobRunner):
         self._prepare_log_dir()
 
         self.log.info('Step 3: Deploy and test the systems')
-        self._deploy_and_test_systems()
+        try:
+            self._deploy_and_test_systems()
+        except:
+            self._remove_workspace()
 
         self.log.info('Step 4: Clean up')
         self._clean_up()
@@ -115,6 +118,7 @@ class Runner(mason.runners.JobRunner):
 
     @mason.util.job_step
     def _create_workspace(self):
+        os.chdir('/root')
         self.commit = self.job_arguments['ZUUL_COMMIT']
         self.project = self.job_arguments['ZUUL_PROJECT']
         self.ref = self.job_arguments['ZUUL_REF']
@@ -203,4 +207,7 @@ class Runner(mason.runners.JobRunner):
 
     @mason.util.job_step
     def _clean_up(self):
+        self._remove_workspace()
+
+    def _remove_workspace(self):
         cliapp.runcmd(['rm', '-rf', self.workspace])