Properly fail in readyState_during_loadeddata.html

servo · Sep 29, 2017 · ce8fc06 · ce8fc06
1 parent 9856580
commit ce8fc06
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 13 deletions.
diff --git a/tests/wpt/metadata/MANIFEST.json b/tests/wpt/metadata/MANIFEST.json
@@ -569837,7 +569837,7 @@
    "testharness"
   ],
   "html/semantics/embedded-content/media-elements/readyState_during_loadeddata.html": [
-   "05eff7f919c9c471f4116d046eb83de3a11cb890",
+   "0f2040296385970bc1fbb2ffa8604e9d0857ff35",
    "testharness"
   ],
   "html/semantics/embedded-content/media-elements/readyState_during_loadedmetadata.html": [

diff --git a/...data/html/semantics/embedded-content/media-elements/readyState_during_loadeddata.html.ini b/...data/html/semantics/embedded-content/media-elements/readyState_during_loadeddata.html.ini
@@ -1,6 +1,5 @@
 [readyState_during_loadeddata.html]
   type: testharness
-  expected: TIMEOUT
   [audio.readyState should be >= HAVE_CURRENT_DATA during loadeddata event]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/...rm-tests/html/semantics/embedded-content/media-elements/readyState_during_loadeddata.html b/...rm-tests/html/semantics/embedded-content/media-elements/readyState_during_loadeddata.html
@@ -17,26 +17,24 @@
 test(function() {
   var t = async_test("audio.readyState should be >= HAVE_CURRENT_DATA during loadeddata event", {timeout:5000});
   var a = document.getElementById("a");
-  a.addEventListener("loadeddata", function() {
-    t.step(function() {
-     assert_greater_than_equal(a.readyState, a.HAVE_CURRENT_DATA);
-    });
+  a.addEventListener("error", t.unreached_func());
+  a.addEventListener("loadeddata", t.step_func(function() {
+    assert_greater_than_equal(a.readyState, a.HAVE_CURRENT_DATA);
     t.done();
     a.pause();
-  }, false);
+  }), false);
   a.src = getAudioURI("/media/sound_5") + "?" + new Date() + Math.random();
 }, "audio events - readyState property during loadeddata");
 
 test(function() {
   var t = async_test("video.readyState should be >= HAVE_CURRENT_DATA during loadeddata event", {timeout:5000});
   var v = document.getElementById("v");
-  v.addEventListener("loadeddata", function() {
-    t.step(function() {
-     assert_greater_than_equal(v.readyState, v.HAVE_CURRENT_DATA);
-    });
+  v.addEventListener("error", t.unreached_func());
+  v.addEventListener("loadeddata", t.step_func(function() {
+    assert_greater_than_equal(v.readyState, v.HAVE_CURRENT_DATA);
     t.done();
     v.pause();
-  }, false);
+  }), false);
   v.src = getVideoURI("/media/movie_5") + "?" + new Date() + Math.random();
 }, "video events - readyState property during loadeddata");
   </script>