From 0b1bb56b961b9ab35feeebeb328fe110c7b695c9 Mon Sep 17 00:00:00 2001 From: Andrew Halberstadt Date: Wed, 30 Oct 2019 21:41:24 +0000 Subject: [PATCH] Bug 1583353 - [mozharness] Remove '-chunked' mochitest and jittest suite definitions, r=gbrown Having a distinction between -chunked and not adds unnecessary complexity. It's possible to simply remove them because: 1. The mozharness definitions for 'jittest' and 'jittest-chunked' are identical, so it is literally not serving any purpose. 2. The definitions for 'mochitest' only add either '--chunk-by-dir' or '--chunk-by-runtime'. Both of these are no-ops in the mochitest harness unless '--total-chunks' is also supplied. Therefore, if we ever use these suites without chunking (which I don't think we do anyway), then it'll still work fine as those options won't have any affect. Differential Revision: https://phabricator.services.mozilla.com/D51173 --HG-- extra : moz-landing-system : lando --- taskcluster/ci/test/compiled.yml | 4 +--- taskcluster/ci/test/mochitest.yml | 8 ++++---- taskcluster/taskgraph/actions/isolate_test.py | 2 -- .../taskgraph/transforms/job/mozharness_test.py | 2 +- .../configs/unittests/linux_unittest.py | 15 +++++---------- .../mozharness/configs/unittests/mac_unittest.py | 12 ++++-------- .../mozharness/configs/unittests/win_unittest.py | 12 ++++-------- .../scripts/android_emulator_unittest.py | 2 -- .../scripts/android_hardware_unittest.py | 2 -- testing/mozharness/scripts/desktop_unittest.py | 5 +---- 10 files changed, 20 insertions(+), 44 deletions(-) diff --git a/taskcluster/ci/test/compiled.yml b/taskcluster/ci/test/compiled.yml index 653ba680ecbe..f73403fd531d 100644 --- a/taskcluster/ci/test/compiled.yml +++ b/taskcluster/ci/test/compiled.yml @@ -69,9 +69,7 @@ gtest: jittest: description: "JIT Test run" - suite: - category: jittest - name: jittest-chunked + suite: jittest treeherder-symbol: Jit run-on-projects: by-test-platform: diff --git a/taskcluster/ci/test/mochitest.yml b/taskcluster/ci/test/mochitest.yml index a74b202ada5e..7cf2f967ef5d 100644 --- a/taskcluster/ci/test/mochitest.yml +++ b/taskcluster/ci/test/mochitest.yml @@ -43,7 +43,7 @@ job-defaults: mochitest: description: "Mochitest plain run" suite: - name: mochitest-plain-chunked + name: mochitest-plain treeherder-symbol: M() loopback-video: true tier: @@ -90,7 +90,7 @@ mochitest-a11y: mochitest-browser-chrome: description: "Mochitest browser-chrome run" suite: - name: mochitest-browser-chrome-chunked + name: mochitest-browser-chrome treeherder-symbol: M(bc) loopback-video: true tier: @@ -167,7 +167,7 @@ mochitest-chrome: mochitest-devtools-chrome: description: "Mochitest devtools-chrome run" suite: - name: mochitest-devtools-chrome-chunked + name: mochitest-devtools-chrome treeherder-symbol: M(dt) loopback-video: true tier: @@ -284,7 +284,7 @@ mochitest-media: mochitest-plain-headless: description: "Mochitest plain headless run" suite: - name: mochitest-plain-chunked + name: mochitest-plain treeherder-symbol: M(h) loopback-video: true chunks: diff --git a/taskcluster/taskgraph/actions/isolate_test.py b/taskcluster/taskgraph/actions/isolate_test.py index e2354854c5a3..423ff12488dd 100644 --- a/taskcluster/taskgraph/actions/isolate_test.py +++ b/taskcluster/taskgraph/actions/isolate_test.py @@ -128,8 +128,6 @@ def create_isolate_failure_tasks(task_definition, failures, level, times): is_windows = 'windows' in th_dict['machine']['platform'] suite = task_definition['extra']['suite'] - if '-chunked' in suite: - suite = suite[:suite.index('-chunked')] if '-coverage' in suite: suite = suite[:suite.index('-coverage')] is_wpt = 'web-platform-tests' in suite diff --git a/taskcluster/taskgraph/transforms/job/mozharness_test.py b/taskcluster/taskgraph/transforms/job/mozharness_test.py index 06b097d7aa20..3a95d7beb171 100644 --- a/taskcluster/taskgraph/transforms/job/mozharness_test.py +++ b/taskcluster/taskgraph/transforms/job/mozharness_test.py @@ -133,7 +133,7 @@ def mozharness_test_on_docker(config, job, taskdesc): 'xpcshell' ] if job['run']['test']['suite'] in suites_not_need_compiz or ( - job['run']['test']['suite'] == 'mochitest-plain-chunked' and + job['run']['test']['suite'] == 'mochitest-plain' and job['run']['test']['try-name'] == 'mochitest-plain-headless'): env['NEED_COMPIZ'] = 'false' diff --git a/testing/mozharness/configs/unittests/linux_unittest.py b/testing/mozharness/configs/unittests/linux_unittest.py index 5fbbfb11d218..e374de5fb87f 100644 --- a/testing/mozharness/configs/unittests/linux_unittest.py +++ b/testing/mozharness/configs/unittests/linux_unittest.py @@ -157,16 +157,13 @@ config = { "--valgrind-supp-files=" + VALGRIND_SUPP_ARCH + "," + VALGRIND_SUPP_CROSS_ARCH, "--timeout=900", "--max-timeouts=50"], - "mochitest-plain": [], + "mochitest-plain": ["--chunk-by-dir=4"], "mochitest-plain-gpu": ["--subsuite=gpu"], - "mochitest-plain-chunked": ["--chunk-by-dir=4"], - "mochitest-plain-chunked-coverage": ["--chunk-by-dir=4", "--timeout=1200"], + "mochitest-plain-coverage": ["--chunk-by-dir=4", "--timeout=1200"], "mochitest-media": ["--subsuite=media"], - "mochitest-chrome": ["--flavor=chrome", "--disable-e10s"], + "mochitest-chrome": ["--flavor=chrome", "--chunk-by-dir=4", "--disable-e10s"], "mochitest-chrome-gpu": ["--flavor=chrome", "--subsuite=gpu", "--disable-e10s"], - "mochitest-chrome-chunked": ["--flavor=chrome", "--chunk-by-dir=4", "--disable-e10s"], - "mochitest-browser-chrome": ["--flavor=browser"], - "mochitest-browser-chrome-chunked": ["--flavor=browser", "--chunk-by-runtime"], + "mochitest-browser-chrome": ["--flavor=browser", "--chunk-by-runtime"], "mochitest-browser-chrome-coverage": ["--flavor=browser", "--chunk-by-runtime", "--timeout=1200"], "mochitest-browser-chrome-screenshots": ["--flavor=browser", "--subsuite=screenshots"], "mochitest-webgl1-core": ["--subsuite=webgl1-core"], @@ -174,8 +171,7 @@ config = { "mochitest-webgl2-core": ["--subsuite=webgl2-core"], "mochitest-webgl2-ext": ["--subsuite=webgl2-ext"], "mochitest-webgl2-deqp": ["--subsuite=webgl2-deqp"], - "mochitest-devtools-chrome": ["--flavor=browser", "--subsuite=devtools"], - "mochitest-devtools-chrome-chunked": ["--flavor=browser", "--subsuite=devtools", "--chunk-by-runtime"], + "mochitest-devtools-chrome": ["--flavor=browser", "--subsuite=devtools", "--chunk-by-runtime"], "mochitest-devtools-chrome-coverage": ["--flavor=browser", "--subsuite=devtools", "--chunk-by-runtime", "--timeout=1200"], "mochitest-a11y": ["--flavor=a11y", "--disable-e10s"], "mochitest-remote": ["--flavor=browser", "--subsuite=remote"], @@ -225,7 +221,6 @@ config = { "jittest": [], "jittest1": ["--total-chunks=2", "--this-chunk=1"], "jittest2": ["--total-chunks=2", "--this-chunk=2"], - "jittest-chunked": [], }, "run_cmd_checks_enabled": True, "preflight_run_cmd_suites": [ diff --git a/testing/mozharness/configs/unittests/mac_unittest.py b/testing/mozharness/configs/unittests/mac_unittest.py index 1ce73881e3a9..14f028d5c063 100644 --- a/testing/mozharness/configs/unittests/mac_unittest.py +++ b/testing/mozharness/configs/unittests/mac_unittest.py @@ -126,23 +126,19 @@ config = { }, # local mochi suites "all_mochitest_suites": { - "mochitest-plain": [], + "mochitest-plain": ["--chunk-by-dir=4"], "mochitest-plain-gpu": ["--subsuite=gpu"], - "mochitest-plain-chunked": ["--chunk-by-dir=4"], "mochitest-media": ["--subsuite=media"], - "mochitest-chrome": ["--flavor=chrome", "--disable-e10s"], + "mochitest-chrome": ["--flavor=chrome", "--chunk-by-dir=4", "--disable-e10s"], "mochitest-chrome-gpu": ["--flavor=chrome", "--subsuite=gpu", "--disable-e10s"], - "mochitest-chrome-chunked": ["--flavor=chrome", "--chunk-by-dir=4", "--disable-e10s"], - "mochitest-browser-chrome": ["--flavor=browser"], - "mochitest-browser-chrome-chunked": ["--flavor=browser", "--chunk-by-runtime"], + "mochitest-browser-chrome": ["--flavor=browser", "--chunk-by-runtime"], "mochitest-browser-chrome-screenshots": ["--flavor=browser", "--subsuite=screenshots"], "mochitest-webgl1-core": ["--subsuite=webgl1-core"], "mochitest-webgl1-ext": ["--subsuite=webgl1-ext"], "mochitest-webgl2-core": ["--subsuite=webgl2-core"], "mochitest-webgl2-ext": ["--subsuite=webgl2-ext"], "mochitest-webgl2-deqp": ["--subsuite=webgl2-deqp"], - "mochitest-devtools-chrome": ["--flavor=browser", "--subsuite=devtools"], - "mochitest-devtools-chrome-chunked": ["--flavor=browser", "--subsuite=devtools", "--chunk-by-runtime"], + "mochitest-devtools-chrome": ["--flavor=browser", "--subsuite=devtools", "--chunk-by-runtime"], "mochitest-devtools-chrome-webreplay": ["--flavor=browser", "--subsuite=devtools-webreplay"], "mochitest-a11y": ["--flavor=a11y", "--disable-e10s"], "mochitest-remote": ["--flavor=browser", "--subsuite=remote"], diff --git a/testing/mozharness/configs/unittests/win_unittest.py b/testing/mozharness/configs/unittests/win_unittest.py index 73d7cc01f54d..d0d3a61c927d 100644 --- a/testing/mozharness/configs/unittests/win_unittest.py +++ b/testing/mozharness/configs/unittests/win_unittest.py @@ -149,23 +149,19 @@ config = { # local mochi suites "all_mochitest_suites": { - "mochitest-plain": [], + "mochitest-plain": ["--chunk-by-dir=4"], "mochitest-plain-gpu": ["--subsuite=gpu"], - "mochitest-plain-chunked": ["--chunk-by-dir=4"], "mochitest-media": ["--subsuite=media"], - "mochitest-chrome": ["--flavor=chrome", "--disable-e10s"], + "mochitest-chrome": ["--flavor=chrome", "--chunk-by-dir=4", "--disable-e10s"], "mochitest-chrome-gpu": ["--flavor=chrome", "--subsuite=gpu", "--disable-e10s"], - "mochitest-chrome-chunked": ["--flavor=chrome", "--chunk-by-dir=4", "--disable-e10s"], - "mochitest-browser-chrome": ["--flavor=browser"], - "mochitest-browser-chrome-chunked": ["--flavor=browser", "--chunk-by-runtime"], + "mochitest-browser-chrome": ["--flavor=browser", "--chunk-by-runtime"], "mochitest-browser-chrome-screenshots": ["--flavor=browser", "--subsuite=screenshots"], "mochitest-webgl1-core": ["--subsuite=webgl1-core"], "mochitest-webgl1-ext": ["--subsuite=webgl1-ext"], "mochitest-webgl2-core": ["--subsuite=webgl2-core"], "mochitest-webgl2-ext": ["--subsuite=webgl2-ext"], "mochitest-webgl2-deqp": ["--subsuite=webgl2-deqp"], - "mochitest-devtools-chrome": ["--flavor=browser", "--subsuite=devtools"], - "mochitest-devtools-chrome-chunked": ["--flavor=browser", "--subsuite=devtools", "--chunk-by-runtime"], + "mochitest-devtools-chrome": ["--flavor=browser", "--subsuite=devtools", "--chunk-by-runtime"], "mochitest-a11y": ["--flavor=a11y", "--disable-e10s"], "mochitest-remote": ["--flavor=browser", "--subsuite=remote"], }, diff --git a/testing/mozharness/scripts/android_emulator_unittest.py b/testing/mozharness/scripts/android_emulator_unittest.py index 207125f96df0..2d1c8672cdfb 100644 --- a/testing/mozharness/scripts/android_emulator_unittest.py +++ b/testing/mozharness/scripts/android_emulator_unittest.py @@ -142,8 +142,6 @@ class AndroidEmulatorTest(TestingMixin, BaseScript, MozbaseMixin, CodeCoverageMi self.test_packages_url = c.get('test_packages_url') self.test_manifest = c.get('test_manifest') suite = c.get('test_suite') - if suite and '-chunked' in suite: - suite = suite[:suite.index('-chunked')] self.test_suite = suite self.this_chunk = c.get('this_chunk') self.total_chunks = c.get('total_chunks') diff --git a/testing/mozharness/scripts/android_hardware_unittest.py b/testing/mozharness/scripts/android_hardware_unittest.py index cac016058a82..c70316ca334b 100644 --- a/testing/mozharness/scripts/android_hardware_unittest.py +++ b/testing/mozharness/scripts/android_hardware_unittest.py @@ -131,8 +131,6 @@ class AndroidHardwareTest(TestingMixin, BaseScript, MozbaseMixin, self.test_packages_url = c.get('test_packages_url') self.test_manifest = c.get('test_manifest') suite = c.get('test_suite') - if suite and '-chunked' in suite: - suite = suite[:suite.index('-chunked')] self.test_suite = suite self.this_chunk = c.get('this_chunk') self.total_chunks = c.get('total_chunks') diff --git a/testing/mozharness/scripts/desktop_unittest.py b/testing/mozharness/scripts/desktop_unittest.py index 8271104d96c7..dd1f069972c0 100755 --- a/testing/mozharness/scripts/desktop_unittest.py +++ b/testing/mozharness/scripts/desktop_unittest.py @@ -374,9 +374,6 @@ class DesktopUnittest(TestingMixin, MercurialScript, MozbaseMixin, def _get_mozharness_test_paths(self, suite_category, suite): test_paths = json.loads(os.environ.get('MOZHARNESS_TEST_PATHS', '""')) - if '-chunked' in suite: - suite = suite[:suite.index('-chunked')] - if '-coverage' in suite: suite = suite[:suite.index('-coverage')] @@ -468,7 +465,7 @@ class DesktopUnittest(TestingMixin, MercurialScript, MozbaseMixin, self.fatal("'%s' not defined in the config!") if suite in ('browser-chrome-coverage', 'xpcshell-coverage', - 'mochitest-devtools-chrome-coverage', 'plain-chunked-coverage'): + 'mochitest-devtools-chrome-coverage', 'plain-coverage'): base_cmd.append('--jscov-dir-prefix=%s' % dirs['abs_blob_upload_dir'])