Bug 979600 - Increase verifyPageTitle wait timeout. r=gbrown
authorMichael Comella <michael.l.comella@gmail.com>
Mon, 23 Jun 2014 10:54:57 -0700
changeset 190182 b4cbfab9148b7692d4c7c0eba8d0836666743120
parent 190181 e2ddcb912e082028a8ca49da4bc12f438ee0d339
child 190183 78ffdbef077c1a1c62d2a9570838dccb0c908696
push id1
push userroot
push dateMon, 20 Oct 2014 17:29:22 +0000
reviewersgbrown
bugs979600
milestone33.0a1
Bug 979600 - Increase verifyPageTitle wait timeout. r=gbrown
mobile/android/base/tests/BaseTest.java
mobile/android/base/tests/robocop.ini
--- a/mobile/android/base/tests/BaseTest.java
+++ b/mobile/android/base/tests/BaseTest.java
@@ -56,16 +56,17 @@ import com.jayway.android.robotium.solo.
 /**
  *  A convenient base class suitable for most Robocop tests.
  */
 @SuppressWarnings("unchecked")
 abstract class BaseTest extends BaseRobocopTest {
     private static final int VERIFY_URL_TIMEOUT = 2000;
     private static final int MAX_WAIT_ENABLED_TEXT_MS = 10000;
     private static final int MAX_WAIT_HOME_PAGER_HIDDEN_MS = 15000;
+    private static final int MAX_WAIT_VERIFY_PAGE_TITLE_MS = 15000;
     public static final int MAX_WAIT_MS = 4500;
     public static final int LONG_PRESS_TIME = 6000;
     private static final int GECKO_READY_WAIT_MS = 180000;
     public static final int MAX_WAIT_BLOCK_FOR_EVENT_DATA_MS = 90000;
 
     private Activity mActivity;
     private int mPreferenceRequestID = 0;
     protected Solo mSolo;
@@ -500,17 +501,17 @@ abstract class BaseTest extends BaseRobo
     }
 
     public final void verifyPageTitle(String title) {
         final TextView urlBarTitle = (TextView) mSolo.getView(R.id.url_bar_title);
         String pageTitle = null;
         if (urlBarTitle != null) {
             // Wait for the title to make sure it has been displayed in case the view
             // does not update fast enough
-            waitForCondition(new VerifyTextViewText(urlBarTitle, title), MAX_WAIT_MS);
+            waitForCondition(new VerifyTextViewText(urlBarTitle, title), MAX_WAIT_VERIFY_PAGE_TITLE_MS);
             pageTitle = urlBarTitle.getText().toString();
         }
         mAsserter.is(pageTitle, title, "Page title is correct");
     }
 
     public final void verifyTabCount(int expectedTabCount) {
         Element tabCount = mDriver.findElement(getActivity(), R.id.tabs_counter);
         String tabCountText = tabCount.getText();
--- a/mobile/android/base/tests/robocop.ini
+++ b/mobile/android/base/tests/robocop.ini
@@ -73,19 +73,17 @@ skip-if = processor == "x86"
 # [testReaderMode] # see bug 913254, 936224
 [testReadingListProvider]
 [testSearchSuggestions]
 # disabled on x86; bug 907768
 skip-if = processor == "x86"
 [testSessionOOMSave]
 # disabled on x86; bug 945395
 skip-if = processor == "x86"
-#[testSessionOOMRestore] # see bug 946957
-# disabled on Android 2.3; bug 979600
-#skip-if = android_version == "10"
+[testSessionOOMRestore]
 [testSettingsMenuItems]
 # disabled on Android 2.3; bug 979552
 skip-if = android_version == "10"
 # [testShareLink] # see bug 915897
 [testSystemPages]
 # disabled on x86 and 2.3; bug 907383, 979603
 skip-if = android_version == "10" || processor == "x86"
 # [testThumbnails] # see bug 813107