Mercurial > mozreview > gecko / changeset / f8b7b4cb7f625441d3a40973d7bea6749a2cc7d7
summary | shortlog | changelog | pushlog | graph | tags | bookmarks | branches | files | changeset | raw | zip | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Bug 1413427 - Part1 - Make Mochitest runs EME with https. draft
authorJames Cheng <jacheng@mozilla.com>
Fri, 03 Nov 2017 12:30:58 +0800
changeset 695351 f8b7b4cb7f625441d3a40973d7bea6749a2cc7d7
parent 695323 b3352a76b43d995790251a2a1ab49d3f61951958
child 695352 ca08431bf03402a5b66b12bbaf85fc5d8d3f325f
push id88402
push userbmo:jacheng@mozilla.com
push dateThu, 09 Nov 2017 04:25:32 +0000
bugs1413427
milestone58.0a1
Bug 1413427 - Part1 - Make Mochitest runs EME with https. MozReview-Commit-ID: 8EfJTXdQkZG
dom/media/test/eme.js file | annotate | diff | comparison | revisions
dom/media/test/mochitest.ini file | annotate | diff | comparison | revisions
dom/media/test/test_eme_autoplay.html file | annotate | diff | comparison | revisions
dom/media/test/test_eme_detach_reattach_same_mediakeys_during_playback.html file | annotate | diff | comparison | revisions
dom/media/test/test_eme_playback.html file | annotate | diff | comparison | revisions
dom/media/test/test_eme_unsetMediaKeys_then_capture.html file | annotate | diff | comparison | revisions
dom/media/test/test_eme_waitingforkey.html file | annotate | diff | comparison | revisions 
--- a/dom/media/test/eme.js
+++ b/dom/media/test/eme.js
@@ -144,17 +144,17 @@ function UpdateSessionFunc(test, token, 
       reject(`${token} MediaKeySession update failed: ${reason}`);
     });
   }
 }
 
 function MaybeCrossOriginURI(test, uri)
 {
   if (test.crossOrigin) {
-    return "http://test2.mochi.test:8888/tests/dom/media/test/allowed.sjs?" + uri;
+    return "https://example.com:443/tests/dom/media/test/allowed.sjs?" + uri;
   } else {
     return uri;
   }
 }
 
 function AppendTrack(test, ms, track, token)
 {
   return new Promise(function(resolve, reject) {
--- a/dom/media/test/mochitest.ini
+++ b/dom/media/test/mochitest.ini
@@ -748,54 +748,73 @@ skip-if = toolkit == 'android' # bug 133
 [test_decode_error.html]
 [test_decoder_disable.html]
 [test_defaultMuted.html]
 [test_delay_load.html]
 skip-if = android_version == '17' # android(bug 1232305)
 [test_duration_after_error.html]
 [test_eme_autoplay.html]
 skip-if = toolkit == 'android' # bug 1149374
+scheme=https
 [test_eme_pssh_in_moof.html]
 skip-if = toolkit == 'android' # bug 1149374
+scheme=https
 [test_eme_session_callable_value.html]
+scheme=https
 [test_eme_canvas_blocked.html]
 skip-if = toolkit == 'android' # bug 1149374
+scheme=https
 [test_eme_detach_media_keys.html]
 skip-if = toolkit == 'android' # bug 1149374
+scheme=https
 [test_eme_detach_reattach_same_mediakeys_during_playback.html]
 skip-if = toolkit == 'android' # bug 1149374
+scheme=https
 [test_eme_initDataTypes.html]
 skip-if = toolkit == 'android' # bug 1149374
+scheme=https
 [test_eme_missing_pssh.html]
 skip-if = toolkit == 'android' # bug 1149374
+scheme=https
 [test_eme_non_mse_fails.html]
 skip-if = toolkit == 'android' # bug 1149374
+scheme=https
 [test_eme_request_notifications.html]
 skip-if = toolkit == 'android' # bug 1149374
+scheme=https
 [test_eme_playback.html]
 skip-if = toolkit == 'android' # bug 1149374
+scheme=https
 [test_eme_requestKeySystemAccess.html]
 skip-if = toolkit == 'android' # bug 1149374
+scheme=https
 [test_eme_sample_groups_playback.html]
 skip-if = toolkit == 'android' # bug 1149374
+scheme=https
 [test_eme_setMediaKeys_before_attach_MediaSource.html]
 skip-if = toolkit == 'android' # bug 1149374
+scheme=https
 [test_eme_stream_capture_blocked_case1.html]
 tags=msg capturestream
 skip-if = toolkit == 'android' # bug 1149374
+scheme=https
 [test_eme_stream_capture_blocked_case2.html]
 tags=msg capturestream
 skip-if = toolkit == 'android' # bug 1149374
+scheme=https
 [test_eme_stream_capture_blocked_case3.html]
 tags=msg capturestream
 skip-if = toolkit == 'android' # bug 1149374
+scheme=https
 [test_eme_unsetMediaKeys_then_capture.html]
 skip-if = toolkit == 'android' # bug 1149374
+scheme=https
 [test_eme_waitingforkey.html]
 skip-if = toolkit == 'android' # bug 1149374
+scheme=https
 [test_empty_resource.html]
 [test_error_in_video_document.html]
 [test_error_on_404.html]
 [test_fastSeek.html]
 skip-if = toolkit == 'android' # android(bug 1232305)
 [test_fastSeek-forwards.html]
 skip-if = toolkit == 'android' # bug 1337590, android(bug 1232305)
 [test_imagecapture.html]
--- a/dom/media/test/test_eme_autoplay.html
+++ b/dom/media/test/test_eme_autoplay.html
@@ -1,16 +1,16 @@
 <!DOCTYPE HTML>
 <html>
 <head>
   <title>Test Encrypted Media Extensions</title>
   <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
   <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
   <script type="text/javascript" src="manifest.js"></script>
-  <script type="text/javascript" src="http://test1.mochi.test:8888/tests/dom/media/test/eme.js"></script>
+  <script type="text/javascript" src="https://example.com:443/tests/dom/media/test/eme.js"></script>
 </head>
 <body>
 <pre id="test">
 <script class="testbody" type="text/javascript">
 var manager = new MediaTestManager;
 
 var EMEmanifest = [
   {
--- a/dom/media/test/test_eme_detach_reattach_same_mediakeys_during_playback.html
+++ b/dom/media/test/test_eme_detach_reattach_same_mediakeys_during_playback.html
@@ -1,16 +1,16 @@
 <!DOCTYPE HTML>
 <html>
 <head>
   <title>Test Encrypted Media Extensions</title>
   <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
   <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
   <script type="text/javascript" src="manifest.js"></script>
-  <script type="text/javascript" src="http://test1.mochi.test:8888/tests/dom/media/test/eme.js"></script>
+  <script type="text/javascript" src="https://example.com:443/tests/dom/media/test/eme.js"></script>
 </head>
 <body>
 <pre id="test">
 <video id="v" controls></video>
 <script class="testbody" type="text/javascript">
 var manager = new MediaTestManager;
 
 var EMEmanifest = [
--- a/dom/media/test/test_eme_playback.html
+++ b/dom/media/test/test_eme_playback.html
@@ -1,16 +1,16 @@
 <!DOCTYPE HTML>
 <html>
 <head>
   <title>Test Encrypted Media Extensions</title>
   <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
   <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
   <script type="text/javascript" src="manifest.js"></script>
-  <script type="text/javascript" src="http://test1.mochi.test:8888/tests/dom/media/test/eme.js"></script>
+  <script type="text/javascript" src="https://example.com:443/tests/dom/media/test/eme.js"></script>
 </head>
 <body>
 <pre id="test">
 <script class="testbody" type="text/javascript">
 var manager = new MediaTestManager;
 
 function ArrayBuffersEqual(a, b) {
   if (a.byteLength != b.byteLength) {
--- a/dom/media/test/test_eme_unsetMediaKeys_then_capture.html
+++ b/dom/media/test/test_eme_unsetMediaKeys_then_capture.html
@@ -1,16 +1,16 @@
 <!DOCTYPE HTML>
 <html>
 <head>
   <title>Test Encrypted Media Extensions</title>
   <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
   <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
   <script type="text/javascript" src="manifest.js"></script>
-  <script type="text/javascript" src="http://test1.mochi.test:8888/tests/dom/media/test/eme.js"></script>
+  <script type="text/javascript" src="https://example.com:443/tests/dom/media/test/eme.js"></script>
 </head>
 <body>
 <pre id="test">
 <script class="testbody" type="text/javascript">
 var manager = new MediaTestManager;
 
 // Test that if we can capture a video frame while playing clear content after
 // removing the MediaKeys object which was used for a previous encrypted content
--- a/dom/media/test/test_eme_waitingforkey.html
+++ b/dom/media/test/test_eme_waitingforkey.html
@@ -1,16 +1,16 @@
 <!DOCTYPE HTML>
 <html>
 <head>
   <title>Test Encrypted Media Extensions</title>
   <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
   <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
   <script type="text/javascript" src="manifest.js"></script>
-  <script type="text/javascript" src="http://test1.mochi.test:8888/tests/dom/media/test/eme.js"></script>
+  <script type="text/javascript" src="https://example.com:443/tests/dom/media/test/eme.js"></script>
 </head>
 <body>
 <pre id="test">
 <script class="testbody" type="text/javascript">
 var manager = new MediaTestManager;
 
 function startTest(test, token)
 {
gecko
Deployed from 4e825768105f at 2024-04-08T16:23:58Z.