From 2f38dfaafb5e39fbc66880dec55b471f137c2a47 Mon Sep 17 00:00:00 2001 From: Joel Maher Date: Thu, 4 Feb 2016 13:35:06 -0800 Subject: [PATCH] Bug 1242682 - Separate dom/media into its own subsuite. r=armenzg, a=Tomcat MozReview-Commit-ID: 55QtAPlIltM --- dom/media/mediasource/test/mochitest.ini | 1 + dom/media/test/mochitest.ini | 1 + .../tests/mochitest/identity/mochitest.ini | 1 + dom/media/tests/mochitest/ipc/mochitest.ini | 1 + dom/media/tests/mochitest/mochitest.ini | 1 + dom/media/webaudio/test/mochitest.ini | 1 + .../webspeech/recognition/test/mochitest.ini | 1 + dom/media/webspeech/synth/test/mochitest.ini | 1 + .../mozharness/configs/android/androidarm.py | 31 +++++++++++++++++++ .../configs/android/androidarm_4_3.py | 29 +++++++++++++++++ .../configs/unittests/linux_unittest.py | 1 + .../configs/unittests/mac_unittest.py | 1 + .../configs/unittests/win_unittest.py | 1 + .../tasks/branches/base_job_flags.yml | 3 ++ .../taskcluster/tasks/branches/base_jobs.yml | 8 +++++ .../tasks/branches/try/job_flags.yml | 8 +++++ .../tests/fx_linux64_mochitest_media.yml | 22 +++++++++++++ .../tests/fx_linux64_mochitest_media_e10s.yml | 22 +++++++++++++ 18 files changed, 134 insertions(+) create mode 100644 testing/taskcluster/tasks/tests/fx_linux64_mochitest_media.yml create mode 100644 testing/taskcluster/tasks/tests/fx_linux64_mochitest_media_e10s.yml diff --git a/dom/media/mediasource/test/mochitest.ini b/dom/media/mediasource/test/mochitest.ini index 8a15e1cfc5f..92a0b9ddb0f 100644 --- a/dom/media/mediasource/test/mochitest.ini +++ b/dom/media/mediasource/test/mochitest.ini @@ -1,5 +1,6 @@ [DEFAULT] skip-if = buildapp == 'b2g' # b2g( ReferenceError: MediaSource is not defined) +subsuite = media support-files = mediasource.js seek.webm seek.webm^headers^ diff --git a/dom/media/test/mochitest.ini b/dom/media/test/mochitest.ini index dc4ba53e0c0..9f8daf64191 100644 --- a/dom/media/test/mochitest.ini +++ b/dom/media/test/mochitest.ini @@ -23,6 +23,7 @@ [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^ diff --git a/dom/media/tests/mochitest/identity/mochitest.ini b/dom/media/tests/mochitest/identity/mochitest.ini index cf3cb04b7f6..ad85bf396da 100644 --- a/dom/media/tests/mochitest/identity/mochitest.ini +++ b/dom/media/tests/mochitest/identity/mochitest.ini @@ -3,6 +3,7 @@ # 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 diff --git a/dom/media/tests/mochitest/ipc/mochitest.ini b/dom/media/tests/mochitest/ipc/mochitest.ini index ffd1640004c..a15b383e5f4 100644 --- a/dom/media/tests/mochitest/ipc/mochitest.ini +++ b/dom/media/tests/mochitest/ipc/mochitest.ini @@ -1,5 +1,6 @@ [DEFAULT] tags=msg +subsuite=media support-files = ipc.json diff --git a/dom/media/tests/mochitest/mochitest.ini b/dom/media/tests/mochitest/mochitest.ini index ada362b2453..dfc8975eb20 100644 --- a/dom/media/tests/mochitest/mochitest.ini +++ b/dom/media/tests/mochitest/mochitest.ini @@ -1,6 +1,7 @@ [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 diff --git a/dom/media/webaudio/test/mochitest.ini b/dom/media/webaudio/test/mochitest.ini index f16a4a59907..133dc2f6f09 100644 --- a/dom/media/webaudio/test/mochitest.ini +++ b/dom/media/webaudio/test/mochitest.ini @@ -1,6 +1,7 @@ [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 diff --git a/dom/media/webspeech/recognition/test/mochitest.ini b/dom/media/webspeech/recognition/test/mochitest.ini index 1fb958f73a7..664694d2cc2 100644 --- a/dom/media/webspeech/recognition/test/mochitest.ini +++ b/dom/media/webspeech/recognition/test/mochitest.ini @@ -1,6 +1,7 @@ [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 diff --git a/dom/media/webspeech/synth/test/mochitest.ini b/dom/media/webspeech/synth/test/mochitest.ini index 5a2d4807294..c1a49913488 100644 --- a/dom/media/webspeech/synth/test/mochitest.ini +++ b/dom/media/webspeech/synth/test/mochitest.ini @@ -1,5 +1,6 @@ [DEFAULT] tags=msg +subsuite = media support-files = common.js file_bfcache_frame.html diff --git a/testing/mozharness/configs/android/androidarm.py b/testing/mozharness/configs/android/androidarm.py index a1d9b18b7da..303b5d6607e 100644 --- a/testing/mozharness/configs/android/androidarm.py +++ b/testing/mozharness/configs/android/androidarm.py @@ -100,6 +100,29 @@ 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", @@ -305,6 +328,14 @@ 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"], diff --git a/testing/mozharness/configs/android/androidarm_4_3.py b/testing/mozharness/configs/android/androidarm_4_3.py index 9ba8d7e6c09..d0c80e69055 100644 --- a/testing/mozharness/configs/android/androidarm_4_3.py +++ b/testing/mozharness/configs/android/androidarm_4_3.py @@ -102,6 +102,27 @@ 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", @@ -445,6 +466,14 @@ 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"], diff --git a/testing/mozharness/configs/unittests/linux_unittest.py b/testing/mozharness/configs/unittests/linux_unittest.py index 457a6446009..eb1ecce9feb 100644 --- a/testing/mozharness/configs/unittests/linux_unittest.py +++ b/testing/mozharness/configs/unittests/linux_unittest.py @@ -210,6 +210,7 @@ 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"], diff --git a/testing/mozharness/configs/unittests/mac_unittest.py b/testing/mozharness/configs/unittests/mac_unittest.py index 44b25911281..ffbc7ace2ed 100644 --- a/testing/mozharness/configs/unittests/mac_unittest.py +++ b/testing/mozharness/configs/unittests/mac_unittest.py @@ -159,6 +159,7 @@ 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"], diff --git a/testing/mozharness/configs/unittests/win_unittest.py b/testing/mozharness/configs/unittests/win_unittest.py index 4827b7b7e6c..793968b815e 100644 --- a/testing/mozharness/configs/unittests/win_unittest.py +++ b/testing/mozharness/configs/unittests/win_unittest.py @@ -170,6 +170,7 @@ 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"], diff --git a/testing/taskcluster/tasks/branches/base_job_flags.yml b/testing/taskcluster/tasks/branches/base_job_flags.yml index b172025b1c7..76bb41155b4 100644 --- a/testing/taskcluster/tasks/branches/base_job_flags.yml +++ b/testing/taskcluster/tasks/branches/base_job_flags.yml @@ -56,6 +56,8 @@ 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.*/ @@ -141,6 +143,7 @@ flags: - mochitest-e10s - mochitest-jetpack - mochitest-media + - mochitest-media-e10s - mochitest-oop - mochitest-push - mochitest-webgl diff --git a/testing/taskcluster/tasks/branches/base_jobs.yml b/testing/taskcluster/tasks/branches/base_jobs.yml index f7253fc4721..a0da0065f22 100644 --- a/testing/taskcluster/tasks/branches/base_jobs.yml +++ b/testing/taskcluster/tasks/branches/base_jobs.yml @@ -290,6 +290,14 @@ 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: diff --git a/testing/taskcluster/tasks/branches/try/job_flags.yml b/testing/taskcluster/tasks/branches/try/job_flags.yml index 14427b11cc7..337558f5850 100644 --- a/testing/taskcluster/tasks/branches/try/job_flags.yml +++ b/testing/taskcluster/tasks/branches/try/job_flags.yml @@ -232,6 +232,14 @@ 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: diff --git a/testing/taskcluster/tasks/tests/fx_linux64_mochitest_media.yml b/testing/taskcluster/tasks/tests/fx_linux64_mochitest_media.yml new file mode 100644 index 00000000000..86d5d9f3a75 --- /dev/null +++ b/testing/taskcluster/tasks/tests/fx_linux64_mochitest_media.yml @@ -0,0 +1,22 @@ +$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 diff --git a/testing/taskcluster/tasks/tests/fx_linux64_mochitest_media_e10s.yml b/testing/taskcluster/tasks/tests/fx_linux64_mochitest_media_e10s.yml new file mode 100644 index 00000000000..87516593e94 --- /dev/null +++ b/testing/taskcluster/tasks/tests/fx_linux64_mochitest_media_e10s.yml @@ -0,0 +1,22 @@ +$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