Bug 1105388 - Avoid robocop shutdown crashes with longer wait. r=mfinkle, a=test-only
authorGeoff Brown <gbrown@mozilla.com>
Tue, 13 Jan 2015 15:42:06 -0700
changeset 249302 13ee27a57a9b0a62c5af0a5283dba249b6fee6c5
parent 249301 b5727b11abfb0ce75437f2113dfc18d128d9a1f7
child 249303 0cbf191913ec1e659924cdc41ae3ed9f0cdc6ed0
push id4489
push userraliiev@mozilla.com
push dateMon, 23 Feb 2015 15:17:55 +0000
treeherdermozilla-beta@fd7c3dc24146 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmfinkle, test-only
bugs1105388
milestone37.0a2
Bug 1105388 - Avoid robocop shutdown crashes with longer wait. r=mfinkle, a=test-only
mobile/android/base/tests/BaseTest.java
mobile/android/base/tests/UITest.java
--- a/mobile/android/base/tests/BaseTest.java
+++ b/mobile/android/base/tests/BaseTest.java
@@ -171,17 +171,17 @@ abstract class BaseTest extends BaseRobo
     }
 
     @Override
     public void tearDown() throws Exception {
         try {
             mAsserter.endTest();
             // request a force quit of the browser and wait for it to take effect
             GeckoAppShell.sendEventToGecko(GeckoEvent.createBroadcastEvent("Robocop:Quit", null));
-            mSolo.sleep(7000);
+            mSolo.sleep(120000);
             // if still running, finish activities as recommended by Robotium
             mSolo.finishOpenedActivities();
         } catch (Throwable e) {
             e.printStackTrace();
         }
         super.tearDown();
     }
 
--- a/mobile/android/base/tests/UITest.java
+++ b/mobile/android/base/tests/UITest.java
@@ -73,17 +73,17 @@ abstract class UITest extends BaseRoboco
     }
 
     @Override
     public void tearDown() throws Exception {
         try {
             mAsserter.endTest();
             // request a force quit of the browser and wait for it to take effect
             GeckoAppShell.sendEventToGecko(GeckoEvent.createBroadcastEvent("Robocop:Quit", null));
-            mSolo.sleep(7000);
+            mSolo.sleep(120000);
             // if still running, finish activities as recommended by Robotium
             mSolo.finishOpenedActivities();
         } catch (Throwable e) {
             e.printStackTrace();
         }
 
         super.tearDown();
     }