Bug 806147 - fix reftests that use setTimeout but not reftest-wait to…

… include reftest-wait; r=dholbert
mozilla-spidermonkey · Oct 27, 2012 · e39b553 · e39b553
1 parent 8d880ba
commit e39b553
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 9 deletions.
diff --git a/layout/reftests/bidi/496006-1.html b/layout/reftests/bidi/496006-1.html
@@ -1,4 +1,4 @@
-<html>
+<html class="reftest-wait">
 <head>
 </head>
 <body style="direction: rtl;">
@@ -13,6 +13,7 @@
 a.style.outline = '1px solid transparent';
 document.body.offsetHeight;
 a.style.outline = '';
+document.documentElement.removeAttribute('class');
 }
 setTimeout(doe, 500);
 </script>

diff --git a/layout/reftests/counters/t1204-increment-00-c-o-test.html b/layout/reftests/counters/t1204-increment-00-c-o-test.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
+<html xmlns="http://www.w3.org/1999/xhtml" class="reftest-wait">
  <head>
   <title>CSS 2.1 Test Suite: dynamic changes to 'counter-increment'</title>
   <link rel="help" href="http://www.w3.org/TR/CSS21/generate.html#counters"/>
@@ -21,11 +21,13 @@
 	s.setAttribute("class", "increment");
 	s.appendChild(document.createTextNode("new-"));
 	t.insertBefore(s, t.childNodes.item(1));
+	document.documentElement.removeAttribute('class');
   }
 
+  document.addEventListener("MozReftestInvalidate", run, false);
   </script>
  </head>
- <body onload="setTimeout('run()', 0)">
+ <body>
 
  <div id="test"><span class="increment"></span><span class="increment"></span><span class="increment"></span></div>
 

diff --git a/layout/reftests/counters/t1204-increment-01-c-o-test.html b/layout/reftests/counters/t1204-increment-01-c-o-test.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
+<html xmlns="http://www.w3.org/1999/xhtml" class="reftest-wait">
  <head>
   <title>CSS 2.1 Test Suite: dynamic changes to 'counter-increment'</title>
   <link rel="help" href="http://www.w3.org/TR/CSS21/generate.html#counters"/>
@@ -18,11 +18,13 @@
   function run() {
 	var t = document.getElementById("test");
 	t.removeChild(t.childNodes.item(1));
+	document.documentElement.removeAttribute('class');
   }
 
+  document.addEventListener("MozReftestInvalidate", run, false);
   </script>
  </head>
- <body onload="setTimeout('run()', 0)">
+ <body>
 
  <div id="test"><span class="increment"></span><span class="increment">FAIL-</span><span class="increment"></span><span class="increment"></span></div>
 

diff --git a/layout/reftests/counters/t1204-increment-02-c-o-test.html b/layout/reftests/counters/t1204-increment-02-c-o-test.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
+<html xmlns="http://www.w3.org/1999/xhtml" class="reftest-wait">
  <head>
   <title>CSS 2.1 Test Suite: dynamic changes to 'counter-increment'</title>
   <link rel="help" href="http://www.w3.org/TR/CSS21/generate.html#counters"/>
@@ -20,11 +20,13 @@
     document.getElementById("one").removeAttribute("class");
 	document.getElementById("two").setAttribute("class", "increment");
 	document.getElementById("three").setAttribute("style", "counter-increment: c");
+	document.documentElement.removeAttribute('class');
   }
 
+  document.addEventListener("MozReftestInvalidate", run, false);
   </script>
  </head>
- <body onload="setTimeout('run()', 0)">
+ <body>
 
  <div id="test"><span id="one" class="increment"></span><span><span class="reset"><span class="increment"></span><span id="two" class="increment"></span></span></span><span id="three" class="use"></span><span class="increment"></span></div>
 

diff --git a/layout/reftests/counters/t1204-reset-01-c-o-test.html b/layout/reftests/counters/t1204-reset-01-c-o-test.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
+<html xmlns="http://www.w3.org/1999/xhtml" class="reftest-wait">
  <head>
   <title>CSS 2.1 Test Suite: dynamic changes to 'counter-increment'</title>
   <link rel="help" href="http://www.w3.org/TR/CSS21/generate.html#counters"/>
@@ -18,11 +18,13 @@
   function run() {
 	var t = document.getElementById("test");
 	t.removeChild(t.childNodes.item(1));
+	document.documentElement.removeAttribute('class');
   }
 
+  document.addEventListener("MozReftestInvalidate", run, false);
   </script>
  </head>
- <body onload="setTimeout('run()', 0)">
+ <body>
 
  <div id="test"><span class="increment"></span><span class="reset"></span><span class="increment"></span><span class="increment"></span></div>