Bug 821821 - Backout hack and enable docshell/test/test_bug590573.html on Android; r=me
authorGeoff Brown <gbrown@mozilla.com>
Fri, 29 Apr 2016 13:42:01 -0600
changeset 295539 30f40e324c976988993d46f5b64466cf5c842f86
parent 295538 c9ed1f5f53583d071883ec3b1a8716ede3f76efb
child 295540 28bba443ce38ac9f70b29702c899f03de7837032
push id19015
push usercbook@mozilla.com
push dateMon, 02 May 2016 09:39:23 +0000
treeherderfx-team@2080375bc69d [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersme
bugs821821, 590573
milestone49.0a1
Bug 821821 - Backout hack and enable docshell/test/test_bug590573.html on Android; r=me
docshell/test/mochitest.ini
docshell/test/test_bug590573.html
--- a/docshell/test/mochitest.ini
+++ b/docshell/test/mochitest.ini
@@ -65,17 +65,17 @@ skip-if = (buildapp == 'b2g' && toolkit 
 support-files = bug530396-noref.sjs bug530396-subframe.html
 [test_bug540462.html]
 skip-if = (buildapp == 'b2g' && toolkit != 'gonk') #Bug 931116, b2g desktop specific, initial triage
 [test_bug551225.html]
 [test_bug570341.html]
 skip-if = (toolkit == 'gonk' && debug) || (android_version == '18' && debug) #debug-only failure, android bug 1040769
 [test_bug580069.html]
 [test_bug590573.html]
-skip-if = buildapp == 'b2g' || toolkit == 'android' #bug 823022 # b2g(queryinterfaces into webnavigation, might suffer from something similar as bug 823022) b2g-debug(queryinterfaces into webnavigation, might suffer from something similar as bug 823022) b2g-desktop(queryinterfaces into webnavigation, might suffer from something similar as bug 823022)
+skip-if = buildapp == 'b2g' #bug 823022 # b2g(queryinterfaces into webnavigation, might suffer from something similar as bug 823022) b2g-debug(queryinterfaces into webnavigation, might suffer from something similar as bug 823022) b2g-desktop(queryinterfaces into webnavigation, might suffer from something similar as bug 823022)
 [test_bug598895.html]
 skip-if = (buildapp == 'b2g' && toolkit != 'gonk') || toolkit == 'android' #Bug 931116, b2g desktop specific, initial triage
 [test_bug634834.html]
 [test_bug637644.html]
 skip-if = (buildapp == 'b2g' && toolkit != 'gonk') || toolkit == 'android' #Bug 931116, b2g desktop specific, initial triage
 [test_bug640387_1.html]
 skip-if = (buildapp == 'b2g' && toolkit != 'gonk') #Bug 931116, b2g desktop specific, initial triage
 [test_bug640387_2.html]
--- a/docshell/test/test_bug590573.html
+++ b/docshell/test/test_bug590573.html
@@ -186,33 +186,23 @@ function pageLoad()
   else if (loads == 5) {
     // Spin the event loop again so that we get the right scroll positions.
     setTimeout(pageLoad, 0);
   }
   else if (loads == 6) {
     is(popup.location.search, "?pushed");
     ok(popup.document.getElementById('div1'), 'page should have div1.');
 
-    // Bug 821821, on android 4.0.4 on panda we get 199 instead of 200
-    if (popup.scrollY >= 199 && popup.scrollY <= 200) {
-      is(1, 1, "test 8");
-    } else {
-      is(1, 0, "test 8, got " + popup.scrollY + " for popup.scrollY instead of 199|200");
-    }
+    is(popup.scrollY, 200, "test 8");
 
     popup.history.back();
     is(popup.scrollY, 150, "test 9");
     popup.history.forward();
 
-    // Bug 821821, on android 4.0.4 on panda we get 199 instead of 200
-    if (popup.scrollY >= 199 && popup.scrollY <= 200) {
-      is(1, 1, "test 10");
-    } else {
-      is(1, 0, "test 10, got " + popup.scrollY + " for popup.scrollY instead of 199|200");
-    }
+    is(popup.scrollY, 200, "test 10");
 
     // Spin one last time...
     setTimeout(pageLoad, 0);
   }
   else if (loads == 7) {
     page2PageShowCallbackEnabled = true;
     popup.history.forward();
   }