Bug 1260055 - Skip test_bug597331.html and test_bug600570.html on Windows versions other than XP. r=ehsan

--HG--
extra : rebase_source : b21ff329905a0e3c96927577f74803bbd0e53ca0

editor/libeditor/tests/mochitest.ini

@@ -79,13 +79,13 @@ skip-if = toolkit == 'android'
 skip-if = toolkit == 'android'
 [test_bug596506.html]
 [test_bug597331.html]
-skip-if = buildapp == 'mulet' || toolkit == 'android' || asan # Bug 1211213
+skip-if = buildapp == 'mulet' || toolkit == 'android' || asan || (os == "win" && os_version != "5.1") # Bug 718316, Bug 1211213
 [test_bug597784.html]
 [test_bug599322.html]
 skip-if = toolkit == 'android'
 [test_bug599983.html]
 [test_bug600570.html]
-skip-if = toolkit == 'android'
+skip-if = toolkit == 'android' || (os == "win" && os_version != "5.1") # Bug 718316
 [test_bug602130.html]
 [test_bug603556.html]
 [test_bug604532.html]

editor/libeditor/tests/test_bug597331.html

@@ -24,10 +24,6 @@ line3
 
 /** Test for Bug 597331 **/
 
-// Bug 718316: This test fails on Windows 7 and 8
-if (navigator.userAgent.indexOf("Windows NT 6.1") == -1 &&
-    navigator.userAgent.indexOf("Windows NT 6.2") == -1) {
-
 SimpleTest.waitForExplicitFinish();
 addLoadEvent(function() {
   SimpleTest.executeSoon(function() {
@@ -70,11 +66,6 @@ addLoadEvent(function() {
   });
 });
 
-}
-else {
-  ok(true, "Somebody thought it was a great idea to make me type this.");
-}
-
 </script>
 </pre>
 </body>

editor/libeditor/tests/test_bug600570.html

@@ -23,10 +23,6 @@ aaa
 
 /** Test for Bug 600570 **/
 
-// Bug 718316: This test fails on Windows 7 and 8
-if (navigator.userAgent.indexOf("Windows NT 6.1") == -1 &&
-    navigator.userAgent.indexOf("Windows NT 6.2") == -1) {
-
 SimpleTest.waitForExplicitFinish();
 SimpleTest.waitForFocus(function() {
   var t = document.querySelector("textarea");
@@ -78,11 +74,6 @@ SimpleTest.waitForFocus(function() {
   });
 });
 
-}
-else {
-  ok(true, "Somebody thought it was a great idea to make me type this.");
-}
-
 </script>
 </pre>
 </body>