diff options
author | Parménides GV <parmegv@sdf.org> | 2015-06-01 10:21:30 +0200 |
---|---|---|
committer | Parménides GV <parmegv@sdf.org> | 2015-06-01 10:21:30 +0200 |
commit | 8d9fe391390578351ae11c7d4305a5b5e5088fb4 (patch) | |
tree | 987aa93ba9561a6c374da5d768c945917d52674d /app/src/androidTest/java/se/leap/bitmaskclient/test/VpnTestController.java | |
parent | de63a99c74bb05c271b0c7a5903b6bfab9ec0a5b (diff) | |
parent | fcc8c55139143092005ffa5b56df2f4320fd9ec4 (diff) |
Merge branch 'bug/pass-tests-for-0.9.4-#7078' into feature/Put-an-icon-in-the-user-status-FabButton-#6923
Diffstat (limited to 'app/src/androidTest/java/se/leap/bitmaskclient/test/VpnTestController.java')
-rw-r--r-- | app/src/androidTest/java/se/leap/bitmaskclient/test/VpnTestController.java | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/app/src/androidTest/java/se/leap/bitmaskclient/test/VpnTestController.java b/app/src/androidTest/java/se/leap/bitmaskclient/test/VpnTestController.java index 40a9f656..25d81da1 100644 --- a/app/src/androidTest/java/se/leap/bitmaskclient/test/VpnTestController.java +++ b/app/src/androidTest/java/se/leap/bitmaskclient/test/VpnTestController.java @@ -52,20 +52,16 @@ public class VpnTestController { } protected FabButton getVpnWholeIcon() { - try { - View view = solo.getView(R.id.vpn_Status_Image); - if (view != null) - return (FabButton) view; - else - return null; - } catch (AssertionFailedError e) { + View view = solo.getView(R.id.vpn_Status_Image); + if (view != null) + return (FabButton) view; + else return null; - } } protected void turningEipOn() { assertInProgress(); - int max_seconds_until_connected = 30; + int max_seconds_until_connected = 120; Condition condition = new Condition() { @Override |