Bug 1322513 - enable some EME tests. r=cpearce
authorJW Wang <jwwang@mozilla.com>
Tue, 15 Nov 2016 17:59:55 +0800
changeset 325425 18892b7432fbdb70e71d3ab0f272dbe466eb0d83
parent 325424 8137e66c6c184111d9d0a913a1eaecee2db4a072
child 325426 fa8864946562294976beb473fb7c21df3d0a2ba6
push id24
push usermaklebus@msu.edu
push dateTue, 20 Dec 2016 03:11:33 +0000
reviewerscpearce
bugs1322513
milestone53.0a1
Bug 1322513 - enable some EME tests. r=cpearce MozReview-Commit-ID: 60UjutEjQf9
testing/web-platform/meta/encrypted-media/__dir__.ini
testing/web-platform/meta/encrypted-media/clearkey-mp4-playback-temporary-encrypted-clear.html.ini
testing/web-platform/meta/encrypted-media/clearkey-mp4-playback-temporary-multikey-sequential.html.ini
testing/web-platform/meta/encrypted-media/clearkey-mp4-playback-temporary-multikey.html.ini
testing/web-platform/meta/encrypted-media/clearkey-mp4-playback-temporary-two-videos.html.ini
testing/web-platform/meta/encrypted-media/clearkey-mp4-playback-temporary.html.ini
testing/web-platform/meta/encrypted-media/clearkey-mp4-reset-src-after-setmediakeys.html.ini
testing/web-platform/meta/encrypted-media/clearkey-mp4-setmediakeys-again-after-resetting-src.html.ini
testing/web-platform/meta/encrypted-media/clearkey-mp4-syntax-mediakeysession.html.ini
testing/web-platform/meta/encrypted-media/clearkey-mp4-waiting-for-a-key.html.ini
deleted file mode 100644
--- a/testing/web-platform/meta/encrypted-media/__dir__.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-disabled:
-  if (os == "linux"): https://bugzilla.mozilla.org/show_bug.cgi?id=1301418
--- a/testing/web-platform/meta/encrypted-media/clearkey-mp4-playback-temporary-encrypted-clear.html.ini
+++ b/testing/web-platform/meta/encrypted-media/clearkey-mp4-playback-temporary-encrypted-clear.html.ini
@@ -1,10 +1,12 @@
 [clearkey-mp4-playback-temporary-encrypted-clear.html]
   type: testharness
+  disabled:
+    if (os == "linux"): https://bugzilla.mozilla.org/show_bug.cgi?id=1301418
   expected:
     if not debug and not e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): TIMEOUT
     if not debug and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): TIMEOUT
     if debug and not e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): TIMEOUT
     if debug and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): TIMEOUT
   [org.w3.clearkey, temporary, mp4, playback, single key, encrypted then clear content]
     expected:
       if not debug and e10s and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): FAIL
deleted file mode 100644
--- a/testing/web-platform/meta/encrypted-media/clearkey-mp4-playback-temporary-multikey-sequential.html.ini
+++ /dev/null
@@ -1,27 +0,0 @@
-[clearkey-mp4-playback-temporary-multikey-sequential.html]
-  type: testharness
-  disabled: https://bugzilla.mozilla.org/show_bug.cgi?id=1312914
-  expected:
-    if os == "linux": TIMEOUT
-  [org.w3.clearkey, successful playback, temporary, mp4, multiple keys and sessions, sequential]
-    expected:
-      if os == "mac": TIMEOUT
-      if (os == "win") and (version == "5.1.2600"): TIMEOUT
-
-  [org.w3.clearkey, successful playback, temporary, mp4, multiple keys, sequential]
-    expected:
-      if not debug and e10s and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): TIMEOUT
-      if debug and not e10s and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): TIMEOUT
-      if debug and e10s and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): TIMEOUT
-      if not debug and not e10s and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): TIMEOUT
-      if not debug and not e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86") and (bits == 32): FAIL
-      if not debug and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86") and (bits == 32): FAIL
-      if debug and not e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-      if not debug and e10s and (os == "win") and (version == "6.2.9200") and (processor == "x86_64") and (bits == 64): FAIL
-      if debug and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-      if not debug and not e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
-      if not debug and not e10s and (os == "win") and (version == "6.2.9200") and (processor == "x86_64") and (bits == 64): FAIL
-      if debug and e10s and (os == "win") and (version == "6.2.9200") and (processor == "x86_64") and (bits == 64): FAIL
-      if debug and not e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
-      if debug and not e10s and (os == "win") and (version == "6.2.9200") and (processor == "x86_64") and (bits == 64): FAIL
-
--- a/testing/web-platform/meta/encrypted-media/clearkey-mp4-playback-temporary-multikey.html.ini
+++ b/testing/web-platform/meta/encrypted-media/clearkey-mp4-playback-temporary-multikey.html.ini
@@ -1,10 +1,12 @@
 [clearkey-mp4-playback-temporary-multikey.html]
   type: testharness
+  disabled:
+    if (os == "linux"): https://bugzilla.mozilla.org/show_bug.cgi?id=1301418
   [org.w3.clearkey, successful playback, temporary, mp4, multiple keys, single session, audio/video]
     expected:
       if (os == "win") and (version == "5.1.2600"): TIMEOUT
 
   [org.w3.clearkey, temporary, mp4, playback, multikey audio/video]
     expected:
       if not debug and e10s and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): FAIL
       if debug and not e10s and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): FAIL
--- a/testing/web-platform/meta/encrypted-media/clearkey-mp4-playback-temporary-two-videos.html.ini
+++ b/testing/web-platform/meta/encrypted-media/clearkey-mp4-playback-temporary-two-videos.html.ini
@@ -1,10 +1,12 @@
 [clearkey-mp4-playback-temporary-two-videos.html]
   type: testharness
+  disabled:
+    if (os == "linux"): https://bugzilla.mozilla.org/show_bug.cgi?id=1301418
   [org.w3.clearkey, sucessful playback, temporary, mp4, set src before setMediaKeys]
     expected:
       if (os == "win") and (version == "5.1.2600"): TIMEOUT
 
   [org.w3.clearkey, temporary, mp4, playback two videos]
     expected:
       if not debug and e10s and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): FAIL
       if debug and not e10s and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): FAIL
--- a/testing/web-platform/meta/encrypted-media/clearkey-mp4-playback-temporary.html.ini
+++ b/testing/web-platform/meta/encrypted-media/clearkey-mp4-playback-temporary.html.ini
@@ -1,10 +1,12 @@
 [clearkey-mp4-playback-temporary.html]
   type: testharness
+  disabled:
+    if (os == "linux"): https://bugzilla.mozilla.org/show_bug.cgi?id=1301418
   [org.w3.clearkey, sucessful playback, temporary, mp4, set src before setMediaKeys]
     expected:
       if (os == "win") and (version == "5.1.2600"): TIMEOUT
 
   [org.w3.clearkey, temporary, mp4, playback, single key]
     expected:
       if not debug and e10s and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): FAIL
       if debug and not e10s and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): FAIL
--- a/testing/web-platform/meta/encrypted-media/clearkey-mp4-reset-src-after-setmediakeys.html.ini
+++ b/testing/web-platform/meta/encrypted-media/clearkey-mp4-reset-src-after-setmediakeys.html.ini
@@ -1,9 +1,11 @@
 [clearkey-mp4-reset-src-after-setmediakeys.html]
   type: testharness
+  disabled:
+    if (os == "linux"): https://bugzilla.mozilla.org/show_bug.cgi?id=1301418
   [Reset src after setMediaKeys().]
     expected:
       if not debug and e10s and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): FAIL
       if debug and not e10s and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): FAIL
       if debug and e10s and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): FAIL
       if not debug and not e10s and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): FAIL
 
--- a/testing/web-platform/meta/encrypted-media/clearkey-mp4-setmediakeys-again-after-resetting-src.html.ini
+++ b/testing/web-platform/meta/encrypted-media/clearkey-mp4-setmediakeys-again-after-resetting-src.html.ini
@@ -1,9 +1,11 @@
 [clearkey-mp4-setmediakeys-again-after-resetting-src.html]
   type: testharness
+  disabled:
+    if (os == "linux"): https://bugzilla.mozilla.org/show_bug.cgi?id=1301418
   [org.w3.clearkey, setmediakeys again after resetting src]
     expected:
       if not debug and e10s and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): FAIL
       if debug and not e10s and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): FAIL
       if debug and e10s and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): FAIL
       if not debug and not e10s and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): FAIL
 
deleted file mode 100644
--- a/testing/web-platform/meta/encrypted-media/clearkey-mp4-syntax-mediakeysession.html.ini
+++ /dev/null
@@ -1,62 +0,0 @@
-[clearkey-mp4-syntax-mediakeysession.html]
-  type: testharness
-  [org.w3.clearkey test MediaKeySession generateRequest() exceptions.]
-    expected:
-      if not debug and e10s and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): FAIL
-      if debug and not e10s and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): FAIL
-      if debug and e10s and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): FAIL
-      if not debug and not e10s and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): FAIL
-
-  [org.w3.clearkey test MediaKeySession load() exceptions.]
-    expected:
-      if not debug and not e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86") and (bits == 32): PASS
-      if not debug and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86") and (bits == 32): PASS
-      if debug and not e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
-      if not debug and e10s and (os == "win") and (version == "6.2.9200") and (processor == "x86_64") and (bits == 64): PASS
-      if debug and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
-      if not debug and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
-      if not debug and not e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
-      if not debug and not e10s and (os == "win") and (version == "6.2.9200") and (processor == "x86_64") and (bits == 64): PASS
-      if debug and e10s and (os == "win") and (version == "6.2.9200") and (processor == "x86_64") and (bits == 64): PASS
-      if debug and not e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
-      if debug and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
-      if debug and not e10s and (os == "win") and (version == "6.2.9200") and (processor == "x86_64") and (bits == 64): PASS
-      if not debug and not e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
-      if not debug and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
-      FAIL
-
-  [org.w3.clearkey test if MediaKeySession generateRequest() resolves for various sessions]
-    expected:
-      if not debug and e10s and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): FAIL
-      if debug and not e10s and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): FAIL
-      if debug and e10s and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): FAIL
-      if not debug and not e10s and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): FAIL
-
-  [org.w3.clearkey test MediaKeySession update() exceptions.]
-    expected:
-      if not debug and e10s and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): FAIL
-      if debug and not e10s and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): FAIL
-      if debug and e10s and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): FAIL
-      if not debug and not e10s and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): FAIL
-
-  [org.w3.clearkey test MediaKeySession close() exceptions.]
-    expected:
-      if not debug and e10s and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): FAIL
-      if debug and not e10s and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): FAIL
-      if debug and e10s and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): FAIL
-      if not debug and not e10s and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): FAIL
-
-  [org.w3.clearkey test MediaKeySession remove() exceptions.]
-    expected:
-      if not debug and e10s and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): FAIL
-      if debug and not e10s and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): FAIL
-      if debug and e10s and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): FAIL
-      if not debug and not e10s and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): FAIL
-
-  [org.w3.clearkey test MediaKeySession attribute syntax.]
-    expected:
-      if not debug and e10s and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): FAIL
-      if debug and not e10s and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): FAIL
-      if debug and e10s and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): FAIL
-      if not debug and not e10s and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): FAIL
-
--- a/testing/web-platform/meta/encrypted-media/clearkey-mp4-waiting-for-a-key.html.ini
+++ b/testing/web-platform/meta/encrypted-media/clearkey-mp4-waiting-for-a-key.html.ini
@@ -1,9 +1,11 @@
 [clearkey-mp4-waiting-for-a-key.html]
   type: testharness
+  disabled:
+    if (os == "linux"): https://bugzilla.mozilla.org/show_bug.cgi?id=1301418
   [Waiting for a key.]
     expected:
       if not debug and e10s and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): FAIL
       if debug and not e10s and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): FAIL
       if debug and e10s and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): FAIL
       if not debug and not e10s and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): FAIL