Backed out changeset 20d8879ac256 (bug 1242682) a=backout CLOSED TREE

MozReview-Commit-ID: AH8yw9fw2kD

dom/media/mediasource/test/mochitest.ini

@@ -1,6 +1,5 @@
 [DEFAULT]
 skip-if = buildapp == 'b2g' # b2g( ReferenceError: MediaSource is not defined)
-subsuite = media
 support-files =
   mediasource.js
   seek.webm seek.webm^headers^

dom/media/test/mochitest.ini

@@ -23,7 +23,6 @@
 
 [DEFAULT]
 skip-if = buildapp == 'mulet' || (os == 'win' && strictContentSandbox) || android_version == '18' # strictContentSandbox (Bug 1042735)
-subsuite = media
 support-files =
   16bit_wave_extrametadata.wav
   16bit_wave_extrametadata.wav^headers^

dom/media/tests/mochitest/identity/mochitest.ini

@@ -3,7 +3,6 @@
 # won't run on b2g desktop tests - bug 1119993
 # broken HTTPS on b2g emulator - bug 1135339
 skip-if = (os == 'win' && strictContentSandbox) || android_version == '10' || android_version == '18' || (buildapp == 'b2g' && toolkit != 'gonk') || (buildapp == 'b2g' && toolkit == 'gonk') || buildapp == 'mulet'
-subsuite = media
 support-files =
   /.well-known/idp-proxy/idp.js
   identityPcTest.js

dom/media/tests/mochitest/ipc/mochitest.ini

@@ -1,6 +1,5 @@
 [DEFAULT]
 tags=msg
-subsuite=media
 support-files =
   ipc.json
 

dom/media/tests/mochitest/mochitest.ini

@@ -1,7 +1,6 @@
 [DEFAULT]
 # strictContentSandbox - bug 1042735, Android 2.3 - bug 981881
 tags = msg webrtc
-subsuite = media
 skip-if = (os == 'win' && strictContentSandbox) || android_version == '10' || (buildapp == 'mulet') || (toolkit == 'gonk' && debug) # b2g(Either bug 1171118 or bug 1169838, take your pick)
 support-files =
   head.js

dom/media/webaudio/test/mochitest.ini

@@ -1,7 +1,6 @@
 [DEFAULT]
 tags=msg
 tags = webaudio
-subsuite = media
 skip-if = ((buildapp == 'b2g') && (toolkit != 'gonk' || debug)) || (os == 'win' && strictContentSandbox) #b2g-debug,b2g-desktop(bug 916135); strictContentSandbox(Bug 1042735)
 support-files =
   audio-expected.wav

dom/media/webspeech/recognition/test/mochitest.ini

@@ -1,7 +1,6 @@
 [DEFAULT]
 tags=msg
 skip-if = buildapp == 'b2g' || (e10s && debug && os == 'win') # Bug 1191270, bug 1037287, bug 967606, bug 1096400, bug 1238542 etc
-subsuite = media
 support-files =
   head.js
   hello.ogg

dom/media/webspeech/synth/test/mochitest.ini

@@ -1,6 +1,5 @@
 [DEFAULT]
 tags=msg
-subsuite = media
 support-files =
   common.js
   file_bfcache_frame.html

testing/mozharness/configs/android/androidarm.py

@@ -100,29 +100,6 @@ config = {
                 "--subsuite=webgl",
             ],
         },
-        "mochitest-media": {
-            "run_filename": "runtestsremote.py",
-            "testsdir": "mochitest",
-            "options": [
-                "--dm_trans=sut",
-                "--app=%(app)s",
-                "--remote-webserver=%(remote_webserver)s",
-                "--xre-path=%(xre_path)s",
-                "--utility-path=%(utility_path)s",
-                "--deviceIP=%(device_ip)s",
-                "--devicePort=%(device_port)s",
-                "--http-port=%(http_port)s",
-                "--ssl-port=%(ssl_port)s",
-                "--certificate-path=%(certs_path)s",
-                "--symbols-path=%(symbols_path)s",
-                "--quiet",
-                "--log-raw=%(raw_log_file)s",
-                "--log-errorsummary=%(error_summary_file)s",
-                "--screenshot-on-fail",
-                "--total-chunks=2",
-                "--subsuite=media",
-            ],
-        },
         "robocop": {
             "run_filename": "runrobocop.py",
             "testsdir": "mochitest",
@@ -328,14 +305,6 @@ config = {
             "category": "mochitest",
             "extra_args": ["--chrome"],
         },
-        "mochitest-media-1": {
-            "category": "mochitest-media",
-            "extra_args": ["--this-chunk=1"],
-        },
-        "mochitest-media-2": {
-            "category": "mochitest-media",
-            "extra_args": ["--this-chunk=2"],
-        },
         "mochitest-gl-1": {
             "category": "mochitest-gl",
             "extra_args": ["--this-chunk=1"],

testing/mozharness/configs/android/androidarm_4_3.py

@@ -102,27 +102,6 @@ config = {
                 "--subsuite=webgl",
             ],
         },
-        "mochitest-media": {
-            "run_filename": "runtestsremote.py",
-            "testsdir": "mochitest",
-            "options": [
-                "--dm_trans=adb",
-                "--app=%(app)s",
-                "--remote-webserver=%(remote_webserver)s",
-                "--xre-path=%(xre_path)s",
-                "--utility-path=%(utility_path)s",
-                "--http-port=%(http_port)s",
-                "--ssl-port=%(ssl_port)s",
-                "--certificate-path=%(certs_path)s",
-                "--symbols-path=%(symbols_path)s",
-                "--quiet",
-                "--log-raw=%(raw_log_file)s",
-                "--log-errorsummary=%(error_summary_file)s",
-                "--screenshot-on-fail",
-                "--total-chunks=2",
-                "--subsuite=media",
-            ],
-        },
         "robocop": {
             "run_filename": "runrobocop.py",
             "testsdir": "mochitest",
@@ -466,14 +445,6 @@ config = {
             "category": "mochitest",
             "extra_args": ["--chrome"],
         },
-        "mochitest-media-1": {
-            "category": "mochitest-media",
-            "extra_args": ["--this-chunk=1"],
-        },
-        "mochitest-media-2": {
-            "category": "mochitest-media",
-            "extra_args": ["--this-chunk=2"],
-        },
         "mochitest-gl-1": {
             "category": "mochitest-gl",
             "extra_args": ["--this-chunk=1"],

testing/mozharness/configs/unittests/linux_unittest.py

@@ -210,7 +210,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"],
         "browser-chrome": ["--browser-chrome"],

testing/mozharness/configs/unittests/mac_unittest.py

@@ -159,7 +159,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"],
         "browser-chrome": ["--browser-chrome"],

testing/mozharness/configs/unittests/win_unittest.py

@@ -170,7 +170,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"],
         "browser-chrome": ["--browser-chrome"],

testing/taskcluster/tasks/branches/base_job_flags.yml

@@ -56,8 +56,6 @@ flags:
     mochitest-dt-e10s: /mochitest-devtools-chrome-e10s.*/
     mochitest-gl: /mochitest-webgl.*/
     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.*/
@@ -143,7 +141,6 @@ flags:
     - mochitest-e10s
     - mochitest-jetpack
     - mochitest-media
-    - mochitest-media-e10s
     - mochitest-oop
     - mochitest-push
     - mochitest-webgl

testing/taskcluster/tasks/branches/base_jobs.yml

@@ -290,14 +290,6 @@ tests:
     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
   mochitest-webgl:
     allowed_build_tasks:
       tasks/builds/dbg_linux64.yml:

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

@@ -232,14 +232,6 @@ tests:
     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
   mochitest-webgl:
     allowed_build_tasks:
       tasks/builds/dbg_linux64_clobber.yml:

testing/taskcluster/tasks/tests/fx_linux64_mochitest_media.yml

@@ -1,22 +0,0 @@
-$inherits:
-  from: 'tasks/tests/fx_desktop_unittest.yml'
-task:
-  scopes:
-    - 'docker-worker:capability:device:loopbackVideo'
-    - 'docker-worker:capability:device:loopbackAudio'
-  metadata:
-    name: '[TC] Linux64 mochitest-media'
-    description: Mochitest media run
-  payload:
-    capabilities:
-      devices:
-        loopbackVideo: true
-        loopbackAudio: true
-  extra:
-    suite:
-      name: mochitest
-      flavor: mochitest-media
-    treeherder:
-      groupName: Desktop mochitests
-      groupSymbol: tc-M
-      symbol: mda

testing/taskcluster/tasks/tests/fx_linux64_mochitest_media_e10s.yml

@@ -1,22 +0,0 @@
-$inherits:
-  from: 'tasks/tests/fx_desktop_unittest.yml'
-task:
-  scopes:
-    - 'docker-worker:capability:device:loopbackVideo'
-    - 'docker-worker:capability:device:loopbackAudio'
-  metadata:
-    name: '[TC] Linux64 mochitest-media-e10s'
-    description: Mochitest media e10s run
-  payload:
-    capabilities:
-      devices:
-        loopbackVideo: true
-        loopbackAudio: true
-  extra:
-    suite:
-      name: mochitest
-      flavor: mochitest-media-e10s
-    treeherder:
-      groupName: Desktop mochitests
-      groupSymbol: tc-M-e10s
-      symbol: mda