Bug 1257708 - Move dom/push/test back into mochitest-plain instead of a separate test suite.
authorRyan VanderMeulen <ryanvm@gmail.com>
Sat, 19 Mar 2016 11:02:04 -0400
changeset 329188 f8228dc37bbfbffc854c05f1d8ffc49caf9fd1a7
parent 329187 d737e53a56b4e7b195a691922b688b3dca11e421
child 329189 b48549fbbe09ff6847997625cab2e7cf05b98391
push id1146
push userCallek@gmail.com
push dateMon, 25 Jul 2016 16:35:44 +0000
treeherdermozilla-release@a55778f9cd5a [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1257708
milestone48.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 1257708 - Move dom/push/test back into mochitest-plain instead of a separate test suite.
dom/push/test/mochitest.ini
testing/mochitest/runtests.py
testing/mozharness/configs/unittests/linux_unittest.py
testing/mozharness/configs/unittests/mac_unittest.py
testing/mozharness/configs/unittests/win_unittest.py
testing/taskcluster/tasks/branches/base_job_flags.yml
testing/taskcluster/tasks/branches/base_jobs.yml
testing/taskcluster/tasks/branches/try/job_flags.yml
testing/taskcluster/tasks/tests/fx_linux64_mochitest_push.yml
--- a/dom/push/test/mochitest.ini
+++ b/dom/push/test/mochitest.ini
@@ -1,18 +1,17 @@
 [DEFAULT]
-subsuite = push
+skip-if = os == "android" || toolkit == "gonk"
 support-files =
   worker.js
   frame.html
   webpush.js
   lifetime_worker.js
   test_utils.js
   mockpushserviceparent.js
-skip-if = os == "android" || toolkit == "gonk"
 
 [test_has_permissions.html]
 [test_permissions.html]
 [test_register.html]
 [test_multiple_register.html]
 [test_multiple_register_during_service_activation.html]
 [test_unregister.html]
 [test_multiple_register_different_scope.html]
--- a/testing/mochitest/runtests.py
+++ b/testing/mochitest/runtests.py
@@ -2255,21 +2255,18 @@ class MochitestDesktop(MochitestBase):
 
         self.browserEnv = self.buildBrowserEnv(
             options,
             debuggerInfo is not None)
 
         # If there are any Mulet-specific tests doing remote network access,
         # we will not be aware since we are explicitely allowing this, as for
         # B2G
-        #
-        # In addition, the push subsuite directly accesses the production
-        # push service.
         if 'MOZ_DISABLE_NONLOCAL_CONNECTIONS' in self.browserEnv:
-            if mozinfo.info.get('buildapp') == 'mulet' or options.subsuite == 'push':
+            if mozinfo.info.get('buildapp') == 'mulet':
                 del self.browserEnv['MOZ_DISABLE_NONLOCAL_CONNECTIONS']
                 os.environ["MOZ_DISABLE_NONLOCAL_CONNECTIONS"] = "0"
 
         if self.browserEnv is None:
             return 1
 
         if self.nsprLogs:
             self.browserEnv["NSPR_LOG_FILE"] = "{}/nspr-pid=%PID-uid={}.log".format(self.browserEnv["MOZ_UPLOAD_DIR"], str(uuid.uuid4()))
--- a/testing/mozharness/configs/unittests/linux_unittest.py
+++ b/testing/mozharness/configs/unittests/linux_unittest.py
@@ -188,17 +188,16 @@ config = {
     # local mochi suites
     "all_mochitest_suites": {
         "valgrind-plain": ["--valgrind=/usr/bin/valgrind",
                            "--valgrind-supp-files=" + VALGRIND_SUPP_ARCH +
                                "," + VALGRIND_SUPP_CROSS_ARCH,
                            "--timeout=900", "--max-timeouts=50"],
          "plain": [],
         "plain-chunked": ["--chunk-by-dir=4"],
-        "mochitest-push": ["--subsuite=push"],
         "mochitest-media": ["--subsuite=media"],
         "chrome": ["--chrome"],
         "chrome-chunked": ["--chrome", "--chunk-by-dir=4"],
         "browser-chrome": ["--browser-chrome"],
         "browser-chrome-chunked": ["--browser-chrome", "--chunk-by-runtime"],
         "browser-chrome-addons": ["--browser-chrome", "--chunk-by-runtime", "--tag=addons"],
         "browser-chrome-coverage": ["--browser-chrome", "--chunk-by-runtime", "--timeout=1200"],
         "browser-chrome-screenshots": ["--browser-chrome", "--subsuite=screenshots"],
--- a/testing/mozharness/configs/unittests/mac_unittest.py
+++ b/testing/mozharness/configs/unittests/mac_unittest.py
@@ -136,17 +136,16 @@ config = {
             ],
             "run_filename": "rungtests.py",
         },
     },
     # local mochi suites
     "all_mochitest_suites": {
         "plain": [],
         "plain-chunked": ["--chunk-by-dir=4"],
-        "mochitest-push": ["--subsuite=push"],
         "mochitest-media": ["--subsuite=media"],
         "chrome": ["--chrome"],
         "chrome-chunked": ["--chrome", "--chunk-by-dir=4"],
         "browser-chrome": ["--browser-chrome"],
         "browser-chrome-chunked": ["--browser-chrome", "--chunk-by-runtime"],
         "browser-chrome-addons": ["--browser-chrome", "--chunk-by-runtime", "--tag=addons"],
         "browser-chrome-screenshots": ["--browser-chrome", "--subsuite=screenshots"],
         "mochitest-gl": ["--subsuite=webgl"],
--- a/testing/mozharness/configs/unittests/win_unittest.py
+++ b/testing/mozharness/configs/unittests/win_unittest.py
@@ -148,17 +148,16 @@ config = {
             "run_filename": "rungtests.py",
         },
     },
     # local mochi suites
     "all_mochitest_suites":
     {
         "plain": [],
         "plain-chunked": ["--chunk-by-dir=4"],
-        "mochitest-push": ["--subsuite=push"],
         "mochitest-media": ["--subsuite=media"],
         "chrome": ["--chrome"],
         "chrome-chunked": ["--chrome", "--chunk-by-dir=4"],
         "browser-chrome": ["--browser-chrome"],
         "browser-chrome-chunked": ["--browser-chrome", "--chunk-by-runtime"],
         "browser-chrome-addons": ["--browser-chrome", "--chunk-by-runtime", "--tag=addons"],
         "browser-chrome-screenshots": ["--browser-chrome", "--subsuite=screenshots"],
         "mochitest-gl": ["--subsuite=webgl"],
--- a/testing/taskcluster/tasks/branches/base_job_flags.yml
+++ b/testing/taskcluster/tasks/branches/base_job_flags.yml
@@ -51,17 +51,16 @@ flags:
     mochitest-bc-e10s: /mochitest-browser-chrome-e10s.*/
     mochitest-browser-chrome: /mochitest-browser-chrome.*/
     mochitest-browser-chrome-e10s: /mochitest-browser-chrome-e10s.*/
     mochitest-chrome: /.*mochitest-chrome.*/
     mochitest-dt: /mochitest-devtools-chrome.*/
     mochitest-dt-e10s: /mochitest-devtools-chrome-e10s.*/
     mochitest-gl: /mochitest-webgl.*/
     mochitest-jetpack: /mochitest-jetpack.*/
-    mochitest-push: /mochitest-push.*/
     mochitest-media: /mochitest-media.*/
     mochitest-media-e10s: /mochitest-media-e10s.*/
     mochitest-vg: /mochitest-valgrind.*/
     reftest: /(plain-)?reftest.*/
     reftest-no-accel: /(plain-)?reftest-no-accel.*/
     reftests: /(plain-)?reftest.*/
     reftests-e10s: /(plain-)?reftest-e10s.*/
     robocop: /robocop.*/
@@ -141,17 +140,16 @@ flags:
     - mochitest-chrome
     - mochitest-devtools-chrome
     - mochitest-devtools-chrome-e10s
     - mochitest-e10s
     - mochitest-jetpack
     - mochitest-media
     - mochitest-media-e10s
     - mochitest-oop
-    - mochitest-push
     - mochitest-webgl
     - mochitest-valgrind
     - mozmill
     - reftest
     - reftest-e10s
     - reftest-ipc
     - reftest-no-accel
     - reftest-sanity-oop
--- a/testing/taskcluster/tasks/branches/base_jobs.yml
+++ b/testing/taskcluster/tasks/branches/base_jobs.yml
@@ -281,20 +281,16 @@ tests:
   mochitest-devtools-chrome:
     allowed_build_tasks:
       tasks/builds/dbg_linux64.yml:
         task: tasks/tests/fx_linux64_mochitest_dt.yml
   mochitest-jetpack:
     allowed_build_tasks:
       tasks/builds/dbg_linux64.yml:
         task: tasks/tests/fx_linux64_mochitest_jetpack.yml
-  mochitest-push:
-    allowed_build_tasks:
-      tasks/builds/dbg_linux64.yml:
-        task: tasks/tests/fx_linux64_mochitest_push.yml
   mochitest-media:
     allowed_build_tasks:
       tasks/builds/dbg_linux64.yml:
         task: tasks/tests/fx_linux64_mochitest_media.yml
   mochitest-media-e10s:
     allowed_build_tasks:
       tasks/builds/dbg_linux64.yml:
         task: tasks/tests/fx_linux64_mochitest_media_e10s.yml
--- a/testing/taskcluster/tasks/branches/try/job_flags.yml
+++ b/testing/taskcluster/tasks/branches/try/job_flags.yml
@@ -235,20 +235,16 @@ tests:
   mochitest-devtools-chrome:
     allowed_build_tasks:
       tasks/builds/dbg_linux64_clobber.yml:
         task: tasks/tests/fx_linux64_mochitest_dt.yml
   mochitest-jetpack:
     allowed_build_tasks:
       tasks/builds/dbg_linux64_clobber.yml:
         task: tasks/tests/fx_linux64_mochitest_jetpack.yml
-  mochitest-push:
-    allowed_build_tasks:
-      tasks/builds/dbg_linux64_clobber.yml:
-        task: tasks/tests/fx_linux64_mochitest_push.yml
   mochitest-media:
     allowed_build_tasks:
       tasks/builds/dbg_linux64_clobber.yml:
         task: tasks/tests/fx_linux64_mochitest_media.yml
   mochitest-media-e10s:
     allowed_build_tasks:
       tasks/builds/dbg_linux64_clobber.yml:
         task: tasks/tests/fx_linux64_mochitest_media_e10s.yml
deleted file mode 100644
--- a/testing/taskcluster/tasks/tests/fx_linux64_mochitest_push.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-$inherits:
-  from: 'tasks/tests/fx_desktop_unittest.yml'
-task:
-  scopes:
-    - 'docker-worker:capability:device:loopbackVideo'
-  metadata:
-    name: '[TC] Linux64 mochitest-push'
-    description: Mochitest push run
-  payload:
-    capabilities:
-      devices:
-        loopbackVideo: true
-  extra:
-    suite:
-      name: mochitest
-      flavor: mochitest-push
-    treeherder:
-      groupName: Desktop mochitests
-      groupSymbol: tc-M
-      symbol: p