Bug 1105388 - Avoid robocop shutdown crashes with longer wait; r=mfinkle
authorGeoff Brown <gbrown@mozilla.com>
Tue, 13 Jan 2015 15:42:06 -0700
changeset 223689 15d5847d41f86ad9eac41179209f117c7365a5b1
parent 223672 6749eed3e68c03ad8c1b9945bc78297201121c95
child 223690 4f64a711181dc0add9338067691a8ed3a33601e0
push id10811
push usercbook@mozilla.com
push dateWed, 14 Jan 2015 13:52:17 +0000
treeherderfx-team@b8d38d19dbd9 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmfinkle
bugs1105388
milestone38.0a1
Bug 1105388 - Avoid robocop shutdown crashes with longer wait; r=mfinkle
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
@@ -176,17 +176,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
@@ -74,17 +74,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();
     }