Bug 1199574 - Add --workspace CLI option as configurable location for…

… all temporary data. r=chmanchester

(cherry picked from commit 7376b59)

firefox_ui_harness/options/base.py

@@ -15,7 +15,10 @@ def __init__(self, **kwargs):
         # Inheriting object must call this __init__ to set up option handling
         self.add_option('--installer',
                         dest='installer',
-                        help='installer of a Gecko application to use for running the tests')
+                        help='Installer of a Gecko application to use for running the tests')
+        self.add_option('--workspace',
+                        dest='workspace_path',
+                        help='Path to use for all temporary data. Defaults to TEMP.')
 
     def parse_args(self, *args, **kwargs):
         options, tests = BaseMarionetteOptions.parse_args(self, *args, **kwargs)

firefox_ui_harness/runtests.py

@@ -23,11 +23,23 @@ def startTestRunner(runner_class, options, tests):
     install_folder = None
 
     try:
+        # Prepare the workspace path so that all temporary data can be stored inside it.
+        if options.workspace_path:
+            path = os.path.expanduser(options.workspace_path)
+            options.workspace = os.path.abspath(path)
+
+            if not os.path.exists(options.workspace):
+                os.makedirs(options.workspace)
+        else:
+            options.workspace = tempfile.mkdtemp('.{}'.format(os.path.basename(sys.argv[0])))
+
+        options.logger.info('Using workspace for temporary data: "{}"'.format(options.workspace))
+
         # If the specified binary is an installer it needs to be installed
         if options.installer:
             installer = os.path.realpath(options.installer)
 
-            dest_folder = tempfile.mkdtemp()
+            dest_folder = os.path.join(options.workspace, 'binary')
             options.logger.info('Installing application "%s" to "%s"' % (installer,
                                                                          dest_folder))
             install_folder = mozinstall.install(installer, dest_folder)