Make script scheduling tests not depend on clock synchronisation betw…

…een client and server
web-platform-tests · Sep 9, 2015 · 1948232 · 1948232
1 parent 2d62e74
commit 1948232
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 36 deletions.
diff --git a/old-tests/submission/Opera/script_scheduling/106.html b/old-tests/submission/Opera/script_scheduling/106.html
@@ -1,27 +1,20 @@
 <!DOCTYPE html>
 <html><head>
-	<title> scheduler: stylesheets blocking scripts</title>
-	<script src="/resources/testharness.js"></script>
-	<script src="/resources/testharnessreport.js"></script>
-	<script src="testlib/testlib.js"></script>
+        <title> scheduler: stylesheets blocking scripts</title>
+        <script src="/resources/testharness.js"></script>
+        <script src="/resources/testharnessreport.js"></script>
+        <script src="testlib/testlib.js"></script>
+        <!-- this stylesheet blocks scripts -->
+        <link rel="stylesheet" href="css/import.css?pipe=trickle(d2)">
 </head>
 <body>
-	<div id="log">FAILED (This TC requires JavaScript enabled)</div>
+        <div id="log">FAILED (This TC requires JavaScript enabled)</div>
         <div id="test">Test</div>
 
-	<script>
-          var t = async_test();
-          var t0 = Date.now();
-        </script>
-
-        <!-- this stylesheet blocks scripts -->
-        <link rel="stylesheet" href="css/import.css?pipe=trickle(d2)">
-
         <script>
-          t.step(function() {
-            var t1 = Date.now();
-            assert_true(t1 - t0 > 1000, "Delayed by "  + (t1-t0) + "ms expected > 1000ms");
-            t.done();
+          test(function() {
+            assert_equals(getComputedStyle(document.getElementById("test")).position,
+                          "fixed");
           });
         </script>
 </body></html>
diff --git a/old-tests/submission/Opera/script_scheduling/107.html b/old-tests/submission/Opera/script_scheduling/107.html
@@ -1,27 +1,21 @@
 <!DOCTYPE html>
 <html><head>
-	<title> scheduler: stylesheets blocking scripts document.write</title>
-	<script src="/resources/testharness.js"></script>
-	<script src="/resources/testharnessreport.js"></script>
-	<script src="testlib/testlib.js"></script>
+        <title> scheduler: stylesheets blocking scripts document.write</title>
+        <script src="/resources/testharness.js"></script>
+        <script src="/resources/testharnessreport.js"></script>
+        <script src="testlib/testlib.js"></script>
 </head>
 <body>
-	<div id="log">FAILED (This TC requires JavaScript enabled)</div>
+        <div id="log">FAILED (This TC requires JavaScript enabled)</div>
         <div id="test">Test</div>
 
-	<script>
-          var t = async_test();
-          var t0 = Date.now();
-        </script>
-
         <!-- this stylesheet blocks scripts -->
         <script>
-          t.step(function() {
+          test(function() {
             document.write("<link rel='stylesheet' href='css/import.css?pipe=trickle(d2)'>");
-            var t1 = Date.now();
             <!-- note that the pass condition here is not per spec (but does match implementations) as of 2012-06-26 -->
-            assert_true(t1-t0 < 1000, "Stylesheet blocked scripts, delayed by " + (t1-t0) + "ms expected < 1000ms");
-            t.done();
+            assert_equals(getComputedStyle(document.getElementById("test")).position,
+                          "static");
           });
         </script>
 </body></html>
diff --git a/old-tests/submission/Opera/script_scheduling/111.html b/old-tests/submission/Opera/script_scheduling/111.html
@@ -10,7 +10,7 @@
         <div id="test"></div>
         <div id="log">FAILED (This TC requires JavaScript enabled)</div>
 
-        <script id="async-script" async src="scripts/include-2.js?pipe=trickle(d2)"></script>
+        <script id="async-script" async src="scripts/include-2.js?pipe=trickle(d3)"></script>
 
         <script>
           var t = async_test();

diff --git a/old-tests/submission/Opera/script_scheduling/css/background.css b/old-tests/submission/Opera/script_scheduling/css/background.css
@@ -1,3 +1 @@
-    #test {background-image:url("1x1-green.png?pipe=trickle(d2)"); 
-           background-repeat:repeat;
-           background-color:orange;}
+#test {position:fixed}
diff --git a/old-tests/submission/Opera/script_scheduling/css/import.css b/old-tests/submission/Opera/script_scheduling/css/import.css
@@ -1 +1 @@
-@import("background.css")
+@import url("background.css")