Bug 1257708 - Move dom/push/test back into mochitest-plain instead of a separate test suite.

dom/push/test/mochitest.ini

@@ -1,5 +1,5 @@
 [DEFAULT]
-subsuite = push
+skip-if = os == "android" || toolkit == "gonk"
 support-files =
   worker.js
   frame.html
@@ -7,7 +7,6 @@ support-files =
   lifetime_worker.js
   test_utils.js
   mockpushserviceparent.js
-skip-if = os == "android" || toolkit == "gonk"
 
 [test_has_permissions.html]
 [test_permissions.html]

testing/mochitest/runtests.py

@@ -2260,11 +2260,8 @@ class MochitestDesktop(MochitestBase):
         # 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"
 

testing/mozharness/configs/unittests/linux_unittest.py

@@ -193,7 +193,6 @@ config = {
                            "--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"],

testing/mozharness/configs/unittests/mac_unittest.py

@@ -141,7 +141,6 @@ config = {
     "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"],

testing/mozharness/configs/unittests/win_unittest.py

@@ -153,7 +153,6 @@ config = {
     {
         "plain": [],
         "plain-chunked": ["--chunk-by-dir=4"],
-        "mochitest-push": ["--subsuite=push"],
         "mochitest-media": ["--subsuite=media"],
         "chrome": ["--chrome"],
         "chrome-chunked": ["--chrome", "--chunk-by-dir=4"],

testing/taskcluster/tasks/branches/base_job_flags.yml

@@ -56,7 +56,6 @@ flags:
     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.*/
@@ -146,7 +145,6 @@ flags:
     - mochitest-media
     - mochitest-media-e10s
     - mochitest-oop
-    - mochitest-push
     - mochitest-webgl
     - mochitest-valgrind
     - mozmill

testing/taskcluster/tasks/branches/base_jobs.yml

@@ -286,10 +286,6 @@ tests:
     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:

testing/taskcluster/tasks/branches/try/job_flags.yml

@@ -240,10 +240,6 @@ tests:
     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:

testing/taskcluster/tasks/tests/fx_linux64_mochitest_push.yml

@@ -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