Bug 1275308 - [mozharness] Rename the run-marionette action to run-tests, r=armenzg
authorAndrew Halberstadt <ahalberstadt@mozilla.com>
Tue, 24 May 2016 12:19:45 -0400
changeset 337804 3449c8ff31c99c48476ae111f6af6357cb3ce256
parent 337803 b6a065dc1103b1455f7cd4bc770bac5864ac1c19
child 337805 be999dda2b73a286f038ad15eb08eb8be94e76db
push id6249
push userjlund@mozilla.com
push dateMon, 01 Aug 2016 13:59:36 +0000
treeherdermozilla-beta@bad9d4f5bf7e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersarmenzg
bugs1275308, 1262260, 1250904
milestone49.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1275308 - [mozharness] Rename the run-marionette action to run-tests, r=armenzg In bug 1262260 and 1250904, we are building some tools to make debugging tests in interactive jobs easier. Part of this includes making it easier to run mozharness scripts with various configurations. Some of these tools depend on a "run-tests" action being present, but in marionette.py, this action is called "run-marionette" instead. Rather than make these tools special case marionette, let's just make marionette.py consistent with every other mozharness script. MozReview-Commit-ID: CrPgjUkCBQR
testing/mozharness/configs/marionette/automation_emulator_config.py
testing/mozharness/configs/marionette/gaia_ui_test_prod_config.py
testing/mozharness/configs/marionette/prod_config.py
testing/mozharness/configs/marionette/test_config.py
testing/mozharness/configs/marionette/windows_config.py
testing/mozharness/scripts/marionette.py
--- a/testing/mozharness/configs/marionette/automation_emulator_config.py
+++ b/testing/mozharness/configs/marionette/automation_emulator_config.py
@@ -28,17 +28,17 @@ config = {
     "buildbot_json_path": "buildprops.json",
 
     "default_actions": [
         'clobber',
         'read-buildbot-config',
         'download-and-extract',
         'create-virtualenv',
         'install',
-        'run-marionette',
+        'run-tests',
     ],
     "download_symbols": "ondemand",
     "download_minidump_stackwalk": True,
     "default_blob_upload_servers": [
         "https://blobupload.elasticbeanstalk.com",
     ],
     "blob_uploader_auth_file": os.path.join(os.getcwd(), "oauth.txt"),
     "suite_definitions": {
--- a/testing/mozharness/configs/marionette/gaia_ui_test_prod_config.py
+++ b/testing/mozharness/configs/marionette/gaia_ui_test_prod_config.py
@@ -34,17 +34,17 @@ config = {
 
     "default_actions": [
         'clobber',
         'read-buildbot-config',
         'pull',
         'download-and-extract',
         'create-virtualenv',
         'install',
-        'run-marionette',
+        'run-tests',
     ],
     "download_symbols": "ondemand",
     "download_minidump_stackwalk": True,
     "default_blob_upload_servers": [
         "https://blobupload.elasticbeanstalk.com",
     ],
     "blob_uploader_auth_file": os.path.join(os.getcwd(), "oauth.txt"),
     "vcs_output_timeout": 1760,
--- a/testing/mozharness/configs/marionette/prod_config.py
+++ b/testing/mozharness/configs/marionette/prod_config.py
@@ -24,17 +24,17 @@ config = {
     "buildbot_json_path": "buildprops.json",
 
     "default_actions": [
         'clobber',
         'read-buildbot-config',
         'download-and-extract',
         'create-virtualenv',
         'install',
-        'run-marionette',
+        'run-tests',
     ],
     "default_blob_upload_servers": [
          "https://blobupload.elasticbeanstalk.com",
     ],
     "blob_uploader_auth_file" : os.path.join(os.getcwd(), "oauth.txt"),
     "download_symbols": "ondemand",
     "download_minidump_stackwalk": True,
     "tooltool_cache": "/builds/tooltool_cache",
--- a/testing/mozharness/configs/marionette/test_config.py
+++ b/testing/mozharness/configs/marionette/test_config.py
@@ -5,17 +5,17 @@ config = {
     "marionette_address": "localhost:2828",
     "test_manifest": "unit-tests.ini",
 
     "default_actions": [
         'clobber',
         'download-and-extract',
         'create-virtualenv',
         'install',
-        'run-marionette',
+        'run-tests',
     ],
     "suite_definitions": {
         "gaiatest_desktop": {
             "options": [
                 "--restart",
                 "--timeout=%(timeout)s",
                 "--testvars=%(testvars)s",
                 "--profile=%(profile)s",
--- a/testing/mozharness/configs/marionette/windows_config.py
+++ b/testing/mozharness/configs/marionette/windows_config.py
@@ -27,17 +27,17 @@ config = {
     "buildbot_json_path": "buildprops.json",
 
     "default_actions": [
         'clobber',
         'read-buildbot-config',
         'download-and-extract',
         'create-virtualenv',
         'install',
-        'run-marionette',
+        'run-tests',
     ],
     "default_blob_upload_servers": [
          "https://blobupload.elasticbeanstalk.com",
     ],
     "blob_uploader_auth_file" : os.path.join(os.getcwd(), "oauth.txt"),
     "download_minidump_stackwalk": True,
     "download_symbols": "ondemand",
     "suite_definitions": {
--- a/testing/mozharness/scripts/marionette.py
+++ b/testing/mozharness/scripts/marionette.py
@@ -147,23 +147,23 @@ class MarionetteTest(TestingMixin, Mercu
         super(MarionetteTest, self).__init__(
             config_options=self.config_options,
             all_actions=['clobber',
                          'read-buildbot-config',
                          'pull',
                          'download-and-extract',
                          'create-virtualenv',
                          'install',
-                         'run-marionette'],
+                         'run-tests'],
             default_actions=['clobber',
                              'pull',
                              'download-and-extract',
                              'create-virtualenv',
                              'install',
-                             'run-marionette'],
+                             'run-tests'],
             require_config_file=require_config_file,
             config={'require_test_zip': True})
 
         # these are necessary since self.config is read only
         c = self.config
         self.installer_url = c.get('installer_url')
         self.installer_path = c.get('installer_path')
         self.binary_path = c.get('binary_path')
@@ -300,17 +300,17 @@ class MarionetteTest(TestingMixin, Mercu
                              halt_on_failure=True, fatal_exit_code=3)
 
     def install(self):
         if self.config.get('emulator'):
             self.info("Emulator tests; skipping.")
         else:
             super(MarionetteTest, self).install()
 
-    def run_marionette(self):
+    def run_tests(self):
         """
         Run the Marionette tests
         """
         dirs = self.query_abs_dirs()
 
         raw_log_file = os.path.join(dirs['abs_blob_upload_dir'],
                                     'marionette_raw.log')
         error_summary_file = os.path.join(dirs['abs_blob_upload_dir'],