mirror of
https://github.com/mozilla/gecko-dev.git
synced 2025-02-17 14:25:49 +00:00
Backed out 2 changesets (bug 1665713) for Lint failure on NetworkPreparationChromeScript.js. CLOSED TREE
Backed out changeset e926364f5d4f (bug 1665713) Backed out changeset ad03f6f54321 (bug 1665713)
This commit is contained in:
parent
fa5df1bbcf
commit
717d9a23ba
@ -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/webrtc/tests/mochitests/identity/idp-bad.js
|
||||
dom/media/tests/mochitest/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
|
||||
|
@ -83,7 +83,7 @@ if CONFIG['MOZ_WEBRTC_SIGNALING']:
|
||||
|
||||
MOCHITEST_MANIFESTS += [
|
||||
'test/mochitest.ini',
|
||||
'webrtc/tests/mochitests/identity/mochitest.ini',
|
||||
'tests/mochitest/identity/mochitest.ini',
|
||||
]
|
||||
|
||||
BROWSER_CHROME_MANIFESTS += [
|
||||
@ -92,7 +92,7 @@ BROWSER_CHROME_MANIFESTS += [
|
||||
]
|
||||
|
||||
if CONFIG['MOZ_WEBRTC']:
|
||||
MOCHITEST_MANIFESTS += ['webrtc/tests/mochitests/mochitest.ini']
|
||||
MOCHITEST_MANIFESTS += ['tests/mochitest/mochitest.ini']
|
||||
|
||||
XPIDL_SOURCES += [
|
||||
'nsIAudioDeviceInfo.idl',
|
||||
|
@ -695,7 +695,7 @@ support-files =
|
||||
wavedata_ulaw.wav^headers^
|
||||
!/dom/canvas/test/captureStream_common.js
|
||||
!/dom/html/test/reflect.js
|
||||
!/dom/media/webrtc/tests/mochitests/head.js
|
||||
!/dom/media/tests/mochitest/head.js
|
||||
hls/bipbop_16x9_single.m3u8
|
||||
hls/bipbop_4x3_single.m3u8
|
||||
hls/bipbop_4x3_variant.m3u8
|
||||
|
@ -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/webrtc/tests/mochitests/head.js"></script>
|
||||
<script src="/tests/dom/media/tests/mochitest/head.js"></script>
|
||||
<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
|
||||
</head>
|
||||
<body>
|
||||
|
@ -4,14 +4,14 @@ skip-if = (os == 'linux' && !debug && !e10s)
|
||||
support-files =
|
||||
/.well-known/idp-proxy/idp.js
|
||||
identityPcTest.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
|
||||
!/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
|
||||
tags = mtg
|
||||
|
||||
[test_idpproxy.html]
|
@ -81,7 +81,7 @@ runTest(async () => {
|
||||
|
||||
// Check that deviceIds are stable for same origin and differ across origins.
|
||||
|
||||
const path = "/tests/dom/media/webrtc/tests/mochitests/test_enumerateDevices_iframe.html";
|
||||
const path = "/tests/dom/media/tests/mochitest/test_enumerateDevices_iframe.html";
|
||||
const origins = ["https://example.com", "https://test1.example.com"];
|
||||
info(window.location);
|
||||
|
@ -1,42 +1,42 @@
|
||||
<!DOCTYPE HTML>
|
||||
<html>
|
||||
<head>
|
||||
<script type="application/javascript" src="mediaStreamPlayback.js"></script>
|
||||
</head>
|
||||
<body>
|
||||
<pre id="test">
|
||||
<script type="application/javascript">
|
||||
createHTML({
|
||||
title: "getUserMedia with Cubeb Disabled Test",
|
||||
bug: "1443525"
|
||||
});
|
||||
/**
|
||||
* Run a test to verify we fail gracefully if we cannot fetch a cubeb context
|
||||
* during a gUM call.
|
||||
*/
|
||||
runTest(async function () {
|
||||
info("Get user media with cubeb disabled starting");
|
||||
// Push prefs to ensure no cubeb context and no fake streams.
|
||||
await pushPrefs(["media.cubeb.force_null_context", true],
|
||||
["media.navigator.permission.device", false],
|
||||
["media.navigator.streams.fake", false]);
|
||||
|
||||
// Request audio only, to avoid cams
|
||||
let constraints = {audio: true, video: false};
|
||||
let stream;
|
||||
try {
|
||||
stream = await getUserMedia(constraints);
|
||||
} catch (e) {
|
||||
// We've got no audio backend, so we expect gUM to fail.
|
||||
ok(e.name == "NotFoundError", "Expected NotFoundError due to no audio tracks!");
|
||||
return;
|
||||
}
|
||||
// If we're not on android we should not have gotten a stream without a cubeb context!
|
||||
ok(false, "getUserMedia not expected to succeed when cubeb is disabled, but it did!");
|
||||
});
|
||||
|
||||
|
||||
</script>
|
||||
</pre>
|
||||
</body>
|
||||
</html>
|
||||
<!DOCTYPE HTML>
|
||||
<html>
|
||||
<head>
|
||||
<script type="application/javascript" src="mediaStreamPlayback.js"></script>
|
||||
</head>
|
||||
<body>
|
||||
<pre id="test">
|
||||
<script type="application/javascript">
|
||||
createHTML({
|
||||
title: "getUserMedia with Cubeb Disabled Test",
|
||||
bug: "1443525"
|
||||
});
|
||||
/**
|
||||
* Run a test to verify we fail gracefully if we cannot fetch a cubeb context
|
||||
* during a gUM call.
|
||||
*/
|
||||
runTest(async function () {
|
||||
info("Get user media with cubeb disabled starting");
|
||||
// Push prefs to ensure no cubeb context and no fake streams.
|
||||
await pushPrefs(["media.cubeb.force_null_context", true],
|
||||
["media.navigator.permission.device", false],
|
||||
["media.navigator.streams.fake", false]);
|
||||
|
||||
// Request audio only, to avoid cams
|
||||
let constraints = {audio: true, video: false};
|
||||
let stream;
|
||||
try {
|
||||
stream = await getUserMedia(constraints);
|
||||
} catch (e) {
|
||||
// We've got no audio backend, so we expect gUM to fail.
|
||||
ok(e.name == "NotFoundError", "Expected NotFoundError due to no audio tracks!");
|
||||
return;
|
||||
}
|
||||
// If we're not on android we should not have gotten a stream without a cubeb context!
|
||||
ok(false, "getUserMedia not expected to succeed when cubeb is disabled, but it did!");
|
||||
});
|
||||
|
||||
|
||||
</script>
|
||||
</pre>
|
||||
</body>
|
||||
</html>
|
@ -1,43 +1,43 @@
|
||||
<!DOCTYPE HTML>
|
||||
<html>
|
||||
<head>
|
||||
<script type="application/javascript" src="mediaStreamPlayback.js"></script>
|
||||
</head>
|
||||
<body>
|
||||
<pre id="test">
|
||||
<script type="application/javascript">
|
||||
createHTML({
|
||||
title: "getUserMedia fake stream with Cubeb Disabled Test",
|
||||
bug: "1443525"
|
||||
});
|
||||
/**
|
||||
* Run a test to verify we can still return a fake stream even if we cannot
|
||||
* get a cubeb context. See also Bug 1434477
|
||||
*/
|
||||
runTest(async function () {
|
||||
info("Get user media with cubeb disabled and fake tracks starting");
|
||||
// Push prefs to ensure no cubeb context and fake streams
|
||||
await pushPrefs(["media.cubeb.force_null_context", true],
|
||||
["media.navigator.streams.fake", true],
|
||||
['media.audio_loopback_dev', '']);
|
||||
let testAudio = createMediaElement('audio', 'testAudio');
|
||||
// Request audio only, to avoid cams
|
||||
let constraints = {audio: true, video: false};
|
||||
let stream;
|
||||
try {
|
||||
stream = await getUserMedia(constraints);
|
||||
} catch (e) {
|
||||
// We've got no audio backend, so we expect gUM to fail
|
||||
ok(false, `Did not expect to fail, but got ${e}`);
|
||||
return;
|
||||
}
|
||||
ok(stream, "getUserMedia should get a stream!");
|
||||
let playback = new MediaStreamPlayback(testAudio, stream);
|
||||
return playback.playMedia(false);
|
||||
});
|
||||
|
||||
|
||||
</script>
|
||||
</pre>
|
||||
</body>
|
||||
</html>
|
||||
<!DOCTYPE HTML>
|
||||
<html>
|
||||
<head>
|
||||
<script type="application/javascript" src="mediaStreamPlayback.js"></script>
|
||||
</head>
|
||||
<body>
|
||||
<pre id="test">
|
||||
<script type="application/javascript">
|
||||
createHTML({
|
||||
title: "getUserMedia fake stream with Cubeb Disabled Test",
|
||||
bug: "1443525"
|
||||
});
|
||||
/**
|
||||
* Run a test to verify we can still return a fake stream even if we cannot
|
||||
* get a cubeb context. See also Bug 1434477
|
||||
*/
|
||||
runTest(async function () {
|
||||
info("Get user media with cubeb disabled and fake tracks starting");
|
||||
// Push prefs to ensure no cubeb context and fake streams
|
||||
await pushPrefs(["media.cubeb.force_null_context", true],
|
||||
["media.navigator.streams.fake", true],
|
||||
['media.audio_loopback_dev', '']);
|
||||
let testAudio = createMediaElement('audio', 'testAudio');
|
||||
// Request audio only, to avoid cams
|
||||
let constraints = {audio: true, video: false};
|
||||
let stream;
|
||||
try {
|
||||
stream = await getUserMedia(constraints);
|
||||
} catch (e) {
|
||||
// We've got no audio backend, so we expect gUM to fail
|
||||
ok(false, `Did not expect to fail, but got ${e}`);
|
||||
return;
|
||||
}
|
||||
ok(stream, "getUserMedia should get a stream!");
|
||||
let playback = new MediaStreamPlayback(testAudio, stream);
|
||||
return playback.playMedia(false);
|
||||
});
|
||||
|
||||
|
||||
</script>
|
||||
</pre>
|
||||
</body>
|
||||
</html>
|
@ -28,7 +28,7 @@ async function iframeGum(dict, iframe = document.createElement("iframe")) {
|
||||
};
|
||||
|
||||
runTest(async () => {
|
||||
const path = "/tests/dom/media/webrtc/tests/mochitests/test_getUserMedia_permission_iframe.html";
|
||||
const path = "/tests/dom/media/tests/mochitest/test_getUserMedia_permission_iframe.html";
|
||||
|
||||
async function sourceFn() {
|
||||
try {
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
x
Reference in New Issue
Block a user