diff --git a/dom/media/test/mochitest.ini b/dom/media/test/mochitest.ini index 04033bc21005..1ac176ef5a90 100644 --- a/dom/media/test/mochitest.ini +++ b/dom/media/test/mochitest.ini @@ -629,7 +629,13 @@ skip-if = toolkit == 'android' # bug 1043403 skip-if = toolkit == 'android' # bug 1043403 [test_eme_requestKeySystemAccess.html] skip-if = toolkit == 'android' # bug 1043403 -[test_eme_stream_capture_blocked.html] +[test_eme_stream_capture_blocked_case1.html] +tags=msg capturestream +skip-if = toolkit == 'android' || (os == 'win' && !debug) # bug 1043403, bug 1140675 +[test_eme_stream_capture_blocked_case2.html] +tags=msg capturestream +skip-if = toolkit == 'android' || (os == 'win' && !debug) # bug 1043403, bug 1140675 +[test_eme_stream_capture_blocked_case3.html] tags=msg capturestream skip-if = toolkit == 'android' || (os == 'win' && !debug) # bug 1043403, bug 1140675 [test_empty_resource.html] diff --git a/dom/media/test/test_eme_stream_capture_blocked.html b/dom/media/test/test_eme_stream_capture_blocked_case1.html similarity index 53% rename from dom/media/test/test_eme_stream_capture_blocked.html rename to dom/media/test/test_eme_stream_capture_blocked_case1.html index 15c36e82af75..6e3734022e6b 100644 --- a/dom/media/test/test_eme_stream_capture_blocked.html +++ b/dom/media/test/test_eme_stream_capture_blocked_case1.html @@ -34,45 +34,6 @@ function startTest(test, token) manager.started(case1token); LoadTestWithManagedLoadToken(test, v1, manager, case1token, { onlyLoadFirstFragments:2, noEndOfStream:true }); - - - // Case 2. creating a MediaElementSource on a media element with a MediaKeys should fail. - var case2token = token + "_case2"; - var v2 = SetupEME(test, case2token); - v2.addEventListener("loadeddata", function(ev) { - ok(true, case2token + " should reach loadeddata"); - var threw = false; - try { - var context = new AudioContext(); - var node = context.createMediaElementSource(v2); - } catch (e) { - threw = true; - } - ok(threw, "Should throw an error creating a MediaElementSource on an EME video."); - manager.finished(case2token); - }); - manager.started(case2token); - LoadTestWithManagedLoadToken(test, v2, manager, case2token, - { onlyLoadFirstFragments:2, noEndOfStream:true }); - - - // Case 3. capturing a media element with mozCaptureStream that has a MediaKeys should fail. - var case3token = token + "_case3"; - var v3 = SetupEME(test, case3token); - v3.addEventListener("loadeddata", function(ev) { - ok(true, TimeStamp(case3token) + " should reach loadeddata"); - var threw = false; - try { - var stream = v3.mozCaptureStreamUntilEnded(); - } catch (e) { - threw = true; - } - ok(threw, TimeStamp(case3token) + " Should throw an error calling mozCaptureStreamUntilEnded an EME video."); - manager.finished(case3token); - }); - manager.started(case3token); - LoadTestWithManagedLoadToken(test, v3, manager, case3token, - { onlyLoadFirstFragments:2, noEndOfStream:true }); } function beginTest() { diff --git a/dom/media/test/test_eme_stream_capture_blocked_case2.html b/dom/media/test/test_eme_stream_capture_blocked_case2.html new file mode 100644 index 000000000000..690446af2d63 --- /dev/null +++ b/dom/media/test/test_eme_stream_capture_blocked_case2.html @@ -0,0 +1,51 @@ + + + + Test Encrypted Media Extensions + + + + + + +
+
+
+ + diff --git a/dom/media/test/test_eme_stream_capture_blocked_case3.html b/dom/media/test/test_eme_stream_capture_blocked_case3.html new file mode 100644 index 000000000000..043d7d566270 --- /dev/null +++ b/dom/media/test/test_eme_stream_capture_blocked_case3.html @@ -0,0 +1,50 @@ + + + + Test Encrypted Media Extensions + + + + + + +
+
+
+ +