Skip to content

Commit

Permalink
Bug 1665713 - pt1 - move dom/media/tests/mochitest to dom/media/webrt…
Browse files Browse the repository at this point in the history
…c/tests/mochitests. r=ng

Differential Revision: https://phabricator.services.mozilla.com/D90614
  • Loading branch information
mfromanmoz committed Oct 2, 2020
1 parent 2ff06be commit 98d5678
Show file tree
Hide file tree
Showing 254 changed files with 33 additions and 33 deletions.
2 changes: 1 addition & 1 deletion .eslintignore
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ dom/base/test/jsmodules/module_badSyntax.js
dom/base/test/jsmodules/test_syntaxErrorInline.html
dom/base/test/jsmodules/test_syntaxErrorInlineAsync.html
dom/base/test/test_bug687859.html
dom/media/tests/mochitest/identity/idp-bad.js
dom/media/webrtc/tests/mochitests/identity/idp-bad.js
dom/serviceworkers/test/file_js_cache_syntax_error.js
dom/serviceworkers/test/parse_error_worker.js
dom/tests/mochitest/bugs/test_bug531176.html
Expand Down
4 changes: 2 additions & 2 deletions dom/media/moz.build
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ if CONFIG['MOZ_WEBRTC_SIGNALING']:

MOCHITEST_MANIFESTS += [
'test/mochitest.ini',
'tests/mochitest/identity/mochitest.ini',
'webrtc/tests/mochitests/identity/mochitest.ini',
]

BROWSER_CHROME_MANIFESTS += [
Expand All @@ -92,7 +92,7 @@ BROWSER_CHROME_MANIFESTS += [
]

if CONFIG['MOZ_WEBRTC']:
MOCHITEST_MANIFESTS += ['tests/mochitest/mochitest.ini']
MOCHITEST_MANIFESTS += ['webrtc/tests/mochitests/mochitest.ini']

XPIDL_SOURCES += [
'nsIAudioDeviceInfo.idl',
Expand Down
2 changes: 1 addition & 1 deletion dom/media/test/mochitest.ini
Original file line number Diff line number Diff line change
Expand Up @@ -695,7 +695,7 @@ support-files =
wavedata_ulaw.wav^headers^
!/dom/canvas/test/captureStream_common.js
!/dom/html/test/reflect.js
!/dom/media/tests/mochitest/head.js
!/dom/media/webrtc/tests/mochitests/head.js
hls/bipbop_16x9_single.m3u8
hls/bipbop_4x3_single.m3u8
hls/bipbop_4x3_variant.m3u8
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<title>Test MediaRecorder recording a constructed MediaStream</title>
<script src="/tests/SimpleTest/SimpleTest.js"></script>
<script src="/tests/dom/canvas/test/captureStream_common.js"></script>
<script src="/tests/dom/media/tests/mochitest/head.js"></script>
<script src="/tests/dom/media/webrtc/tests/mochitests/head.js"></script>
<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
</head>
<body>
Expand Down
4 changes: 2 additions & 2 deletions dom/media/webaudio/test/mochitest.ini
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@ support-files =
ting-48k-2ch.wav
sine-440-10s.opus
webaudio.js
../../tests/mochitest/mediaStreamPlayback.js
../../tests/mochitest/head.js
../../webrtc/tests/mochitests/mediaStreamPlayback.js
../../webrtc/tests/mochitests/head.js

[test_analyserNode.html]
skip-if = !asan && toolkit != android # These are tested in web-platform-tests, except on ASan and Android which don't run WPT.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<title>Test MediaStreamTrackAudioSourceNode throw video track</title>
<script src="/tests/SimpleTest/SimpleTest.js"></script>
<script type="text/javascript" src="/tests/dom/media/webaudio/test/webaudio.js"></script>
<script type="text/javascript" src="/tests/dom/media/tests/mochitest/head.js"></script>
<script type="text/javascript" src="/tests/dom/media/webrtc/tests/mochitests/head.js"></script>
<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
</head>
<body>
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@ skip-if = (os == 'linux' && !debug && !e10s)
support-files =
/.well-known/idp-proxy/idp.js
identityPcTest.js
!/dom/media/tests/mochitest/blacksilence.js
!/dom/media/tests/mochitest/dataChannel.js
!/dom/media/tests/mochitest/head.js
!/dom/media/tests/mochitest/network.js
!/dom/media/tests/mochitest/pc.js
!/dom/media/tests/mochitest/sdpUtils.js
!/dom/media/tests/mochitest/templates.js
!/dom/media/tests/mochitest/turnConfig.js
!/dom/media/webrtc/tests/mochitests/blacksilence.js
!/dom/media/webrtc/tests/mochitests/dataChannel.js
!/dom/media/webrtc/tests/mochitests/head.js
!/dom/media/webrtc/tests/mochitests/network.js
!/dom/media/webrtc/tests/mochitests/pc.js
!/dom/media/webrtc/tests/mochitests/sdpUtils.js
!/dom/media/webrtc/tests/mochitests/templates.js
!/dom/media/webrtc/tests/mochitests/turnConfig.js
tags = mtg

[test_idpproxy.html]
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -2415,7 +2415,7 @@ function loadScript(...scripts) {
// Ensure SimpleTest.js is loaded before other scripts.
var scriptsReady = loadScript("/tests/SimpleTest/SimpleTest.js").then(() => {
return loadScript(
"../../test/manifest.js",
"../../../test/manifest.js",
"head.js",
"templates.js",
"turnConfig.js",
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@

// Check that deviceIds are stable for same origin and differ across origins.

const path = "/tests/dom/media/tests/mochitest/test_enumerateDevices_iframe.html";
const path = "/tests/dom/media/webrtc/tests/mochitests/test_enumerateDevices_iframe.html";
const origins = ["https://example.com", "https://test1.example.com"];
info(window.location);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
};

runTest(async () => {
const path = "/tests/dom/media/tests/mochitest/test_getUserMedia_permission_iframe.html";
const path = "/tests/dom/media/webrtc/tests/mochitests/test_getUserMedia_permission_iframe.html";

async function sourceFn() {
try {
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
video.muted = true;
video.controls = true;
video.preload = "metadata";
video.src = "../../test/" + media.name;
video.src = "../../../test/" + media.name;

document.getElementById("content").appendChild(video);

Expand Down
File renamed without changes.
14 changes: 7 additions & 7 deletions taskcluster/test/data/bugbug-push-schedules.json
Original file line number Diff line number Diff line change
Expand Up @@ -612,7 +612,12 @@
"test-windows10-64/opt-*-spi-e10s",
"test-linux1804-64/opt-*-spi-e10s"
],
"dom/media/tests/mochitest/mochitest.ini": [
"dom/media/webaudio/test/mochitest.ini": [
"test-windows10-64/opt-*-e10s",
"test-windows10-64-qr/debug-*-spi-e10s",
"test-windows10-64-qr/opt-*-spi-e10s"
],
"dom/media/webrtc/tests/mochitests/mochitest.ini": [
"test-linux1804-64/debug-*-e10s",
"test-linux1804-64-qr/debug-*-fis-e10s",
"test-windows10-64/debug-*-e10s",
Expand All @@ -624,11 +629,6 @@
"test-android-hw-p2-8-0-android-aarch64/debug-geckoview-*-spi-e10s",
"test-windows7-32/debug-*-e10s"
],
"dom/media/webaudio/test/mochitest.ini": [
"test-windows10-64/opt-*-e10s",
"test-windows10-64-qr/debug-*-spi-e10s",
"test-windows10-64-qr/opt-*-spi-e10s"
],
"dom/media/webvtt/tests/xpcshell.ini": [
"test-linux1804-64-qr/opt-*-e10s"
],
Expand Down Expand Up @@ -2273,8 +2273,8 @@
"dom/media/mediasource/test/mochitest.ini": 0.82,
"dom/media/test/crashtests/crashtests.list": 0.57,
"dom/media/test/mochitest.ini": 0.95,
"dom/media/tests/mochitest/mochitest.ini": 0.98,
"dom/media/webaudio/test/mochitest.ini": 0.61,
"dom/media/webrtc/tests/mochitests/mochitest.ini": 0.98,
"dom/media/webvtt/tests/xpcshell.ini": 0.8,
"dom/network/tests/chrome.ini": 0.57,
"dom/performance/tests/mochitest.ini": 0.67,
Expand Down
4 changes: 2 additions & 2 deletions testing/runtimes/manifest-runtimes-android.json
Original file line number Diff line number Diff line change
Expand Up @@ -68,10 +68,10 @@
"dom/media/mediasession/test/mochitest.ini": 5.24,
"dom/media/mediasource/test/mochitest.ini": 44.09,
"dom/media/test/mochitest.ini": 661.4,
"dom/media/tests/mochitest/identity/mochitest.ini": 6.98,
"dom/media/tests/mochitest/mochitest.ini": 313.02,
"dom/media/webaudio/test/blink/mochitest.ini": 2.56,
"dom/media/webaudio/test/mochitest.ini": 112.74,
"dom/media/webrtc/tests/mochitests/identity/mochitest.ini": 6.98,
"dom/media/webrtc/tests/mochitests/mochitest.ini": 313.02,
"dom/media/webspeech/recognition/test/mochitest.ini": 32.99,
"dom/media/webspeech/synth/test/mochitest.ini": 5.45,
"dom/media/webspeech/synth/test/startup/mochitest.ini": 1.22
Expand Down
4 changes: 2 additions & 2 deletions testing/runtimes/manifest-runtimes-unix.json
Original file line number Diff line number Diff line change
Expand Up @@ -467,10 +467,10 @@
"dom/media/mediasession/test/mochitest.ini": 12.29,
"dom/media/mediasource/test/mochitest.ini": 179.03,
"dom/media/test/mochitest.ini": 1466.05,
"dom/media/tests/mochitest/identity/mochitest.ini": 26.38,
"dom/media/tests/mochitest/mochitest.ini": 723.27,
"dom/media/webaudio/test/blink/mochitest.ini": 3.24,
"dom/media/webaudio/test/mochitest.ini": 285.46,
"dom/media/webrtc/tests/mochitests/identity/mochitest.ini": 26.38,
"dom/media/webrtc/tests/mochitests/mochitest.ini": 723.27,
"dom/media/webspeech/recognition/test/mochitest.ini": 50.98,
"dom/media/webspeech/synth/test/mochitest.ini": 5.86,
"dom/media/webspeech/synth/test/startup/mochitest.ini": 1.23
Expand Down
4 changes: 2 additions & 2 deletions testing/runtimes/manifest-runtimes-windows.json
Original file line number Diff line number Diff line change
Expand Up @@ -462,10 +462,10 @@
"dom/media/mediasession/test/mochitest.ini": 5.08,
"dom/media/mediasource/test/mochitest.ini": 134.74,
"dom/media/test/mochitest.ini": 966.42,
"dom/media/tests/mochitest/identity/mochitest.ini": 11.66,
"dom/media/tests/mochitest/mochitest.ini": 412.53,
"dom/media/webaudio/test/blink/mochitest.ini": 2.35,
"dom/media/webaudio/test/mochitest.ini": 110.28,
"dom/media/webrtc/tests/mochitests/identity/mochitest.ini": 11.66,
"dom/media/webrtc/tests/mochitests/mochitest.ini": 412.53,
"dom/media/webspeech/recognition/test/mochitest.ini": 32.74,
"dom/media/webspeech/synth/test/mochitest.ini": 4.86,
"dom/media/webspeech/synth/test/startup/mochitest.ini": 1.18
Expand Down

0 comments on commit 98d5678

Please sign in to comment.