Merge 06c00ad into d5510d2

Author: parkouss

mozregression/test_runner.py

@@ -13,6 +13,8 @@
 import subprocess
 import shlex
 import os
+import tempfile
+import mozfile
 
 from mozregression.launchers import create_launcher
 from mozregression.errors import TestCommandError
@@ -84,6 +86,20 @@ class ManualTestRunner(TestRunner):
     A TestRunner subclass that run builds and ask for evaluation by
     prompting in the terminal.
     """
+    def __init__(self, fetch_config, persist=None, launcher_kwargs=None):
+        self.delete_persist = False
+        if persist is None:
+            # always keep the downloaded files for manual runner
+            # this allows to not re-download a file if a user retry a build.
+            persist = tempfile.mkdtemp()
+            self.delete_persist = True
+        TestRunner.__init__(self, fetch_config, persist=persist,
+                            launcher_kwargs=launcher_kwargs)
+
+    def __del__(self):
+        if self.delete_persist:
+            mozfile.remove(self.persist)
+
     def get_verdict(self, build_info):
         """
         Ask and returns the verdict.

tests/unit/test_test_runner.py

@@ -7,6 +7,7 @@
 import unittest
 from mock import patch, Mock
 import datetime
+import os
 
 from mozregression.fetch_configs import create_config
 from mozregression import test_runner, errors
@@ -16,7 +17,7 @@ def setUp(self):
         fetch_config = create_config('firefox', 'linux', 64)
         fetch_config.set_nightly_repo('my-repo')
         fetch_config.set_inbound_branch('my-branch')
-        self.runner = test_runner.ManualTestRunner(fetch_config)
+        self.runner = test_runner.ManualTestRunner(fetch_config, persist='/path/to')
 
     @patch('mozregression.test_runner.create_launcher')
     def test_nightly_create_launcher(self, create_launcher):
@@ -29,7 +30,7 @@ def test_nightly_create_launcher(self, create_launcher):
         })
         create_launcher.assert_called_with('firefox', 'http://my-url',
                                            persist_prefix='2014-12-25--my-repo--',
-                                           persist=None)
+                                           persist='/path/to')
         self.assertEqual(result_launcher, launcher)
 
     @patch('mozregression.test_runner.create_launcher')
@@ -44,7 +45,7 @@ def test_inbound_create_launcher(self, create_launcher):
         })
         create_launcher.assert_called_with('firefox', 'http://my-url',
                                            persist_prefix='123--my-branch--',
-                                           persist=None)
+                                           persist='/path/to')
         self.assertEqual(result_launcher, launcher)
 
     @patch('__builtin__.raw_input')
@@ -69,6 +70,15 @@ def test_evaluate(self, get_verdict, create_launcher):
         launcher.stop.assert_called_with()
         self.assertEqual(result[0], 'g')
 
+    def test_persist_none_is_overidden(self):
+        runner = test_runner.ManualTestRunner(self.runner.fetch_config, persist=None)
+        persist = runner.persist
+        self.assertIsNotNone(persist)
+        self.assertTrue(os.path.isdir(persist))
+        # deleting the runner also delete the temp dir
+        del runner
+        self.assertFalse(os.path.exists(persist))
+
 class TestCommandTestRunner(unittest.TestCase):
     def setUp(self):
         fetch_config = create_config('firefox', 'linux', 64)