Bug 913683 - Verify home pager is hidden before checking to make sure the page is painted, and increase the time we wait to make sure these things happen. r=gbrown
☠☠ backed out by d3a3c14c23e3 ☠ ☠
authorMargaret Leibovic <margaret.leibovic@gmail.com>
Tue, 17 Sep 2013 09:14:12 -0400
changeset 147576 dea697e42d70276d9ed0fdd8917e44cc88b5d317
parent 147575 68a3dd6385c0c13200a25cc58f348245aede0f6e
child 147577 d7c49f9c66c3ece33173c61fbbe35a7aba3e9172
push id25307
push userryanvm@gmail.com
push dateWed, 18 Sep 2013 02:44:29 +0000
treeherdermozilla-central@44f4567699ff [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersgbrown
bugs913683
milestone26.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 913683 - Verify home pager is hidden before checking to make sure the page is painted, and increase the time we wait to make sure these things happen. r=gbrown
mobile/android/base/tests/BaseTest.java.in
mobile/android/base/tests/PixelTest.java.in
mobile/android/base/tests/testCheck2.java.in
--- a/mobile/android/base/tests/BaseTest.java.in
+++ b/mobile/android/base/tests/BaseTest.java.in
@@ -44,17 +44,17 @@ abstract class BaseTest extends Activity
     public static final int TEST_MOCHITEST = 0;
     public static final int TEST_TALOS = 1;
 
     private static final String TARGET_PACKAGE_ID = "org.mozilla.gecko";
     private static final String LAUNCH_ACTIVITY_FULL_CLASSNAME ="@ANDROID_PACKAGE_NAME@.App";
     private static final int VERIFY_URL_TIMEOUT = 2000;
     private static final int MAX_LIST_ATTEMPTS = 3;
     private static final int MAX_WAIT_ENABLED_TEXT_MS = 10000;
-    private static final int MAX_WAIT_HOME_PAGER_HIDDEN_MS = 10000;
+    private static final int MAX_WAIT_HOME_PAGER_HIDDEN_MS = 15000;
     public static final int MAX_WAIT_MS = 3000;
 
     // IDs for UI views
     private static final String BROWSER_TOOLBAR_ID = "browser_toolbar";
     protected static final String URL_EDIT_TEXT_ID = "url_edit_text";
     protected static final String URL_BAR_TITLE_ID = "url_bar_title";
 
     private static Class<Activity> mLauncherActivityClass;
--- a/mobile/android/base/tests/PixelTest.java.in
+++ b/mobile/android/base/tests/PixelTest.java.in
@@ -1,19 +1,20 @@
 #filter substitution
 package @ANDROID_PACKAGE_NAME@.tests;
 
 import @ANDROID_PACKAGE_NAME@.*;
 
 abstract class PixelTest extends BaseTest {
-    private static final long PAINT_CLEAR_DELAY = 3000; // milliseconds
+    private static final long PAINT_CLEAR_DELAY = 10000; // milliseconds
 
     protected final PaintedSurface loadAndGetPainted(String url) {
         Actions.RepeatedEventExpecter paintExpecter = mActions.expectPaint();
         loadUrl(url);
+        verifyHomePagerHidden();
         paintExpecter.blockUntilClear(PAINT_CLEAR_DELAY);
         paintExpecter.unregisterListener();
         PaintedSurface p = mDriver.getPaintedSurface();
         if (p == null) {
             mAsserter.ok(p != null, "checking that painted surface loaded", 
                  "painted surface loaded");
         }
         return p;
--- a/mobile/android/base/tests/testCheck2.java.in
+++ b/mobile/android/base/tests/testCheck2.java.in
@@ -7,17 +7,16 @@ public class testCheck2 extends PixelTes
         return TEST_TALOS;
     }
 
     public void testCheck2() {
         String url = getAbsoluteUrl("/startup_test/fennecmark/cnn/cnn.com/index.html");
 
         blockForGeckoReady();
         loadAndPaint(url);
-        verifyHomePagerHidden();
 
         mDriver.setupScrollHandling();
 
         /*
          * for this test, we load the timecube page, and replay a recorded sequence of events
          * that is a user panning/zooming around the page. specific things in the sequence
          * include:
          * - scroll on one axis followed by scroll on another axis