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 242956 ea7deca21c27
parent 242955 8691f7169392
child 242957 54386fba64a7
push id4344
push userryanvm@gmail.com
push date2015-01-20 17:02 +0000
treeherdermozilla-beta@ea7deca21c27 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmfinkle, test-only
bugs1105388
milestone36.0
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
@@ -175,17 +175,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
@@ -81,17 +81,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();
     }