cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

travis: add delay to increase reliability

Browse Source
This commit is contained in:
Andrea Torlaschi
2016-07-10 20:27:55 +02:00
parent 635358189c
commit fa926c7241
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
.travis.yml
View File

@@ -41,8 +41,9 @@ script:
echo no | android create avd --force --name test --target $ANDROID_TARGET --abi $ANDROID_ABI; echo no | android create avd --force --name test --target $ANDROID_TARGET --abi $ANDROID_ABI;
emulator -avd test -no-skin -no-audio -no-window & emulator -avd test -no-skin -no-audio -no-window &
android-wait-for-emulator; android-wait-for-emulator;
adb devices; sleep 10;
adb shell svc power stayon true; adb shell svc power stayon true;
sleep 5;
adb shell input keyevent 82; adb shell input keyevent 82;
./gradlew --stacktrace connectedFdroidDebugAndroidTest -i; ./gradlew --stacktrace connectedFdroidDebugAndroidTest -i;
fi fi

8
OpenKeychain/src/androidTest/java/org/sufficientlysecure/keychain/remote/OpenPgpServiceTest.java
View File

@@ -40,7 +40,7 @@ import static org.sufficientlysecure.keychain.matcher.CustomMatchers.withKeyItem
@LargeTest @LargeTest
public class OpenPgpServiceTest { public class OpenPgpServiceTest {
public static final int ACTIVITY_WAIT_TIME = 2; public static final int ACTIVITY_WAIT_TIME = 2 * 1000;
@Rule @Rule
public final ServiceTestRule mServiceRule = new ServiceTestRule(); public final ServiceTestRule mServiceRule = new ServiceTestRule();
@@ -81,7 +81,7 @@ public class OpenPgpServiceTest {
PendingIntent pi = result.getParcelableExtra(OpenPgpApi.RESULT_INTENT); PendingIntent pi = result.getParcelableExtra(OpenPgpApi.RESULT_INTENT);
pi.send(); pi.send();
Thread.sleep(ACTIVITY_WAIT_TIME * 1000); // Wait for activity to start Thread.sleep(ACTIVITY_WAIT_TIME); // Wait for activity to start
onView(withText(R.string.api_register_allow)).perform(click()); onView(withText(R.string.api_register_allow)).perform(click());
} }
@@ -120,7 +120,7 @@ public class OpenPgpServiceTest {
PendingIntent pi = result.getParcelableExtra(OpenPgpApi.RESULT_INTENT); PendingIntent pi = result.getParcelableExtra(OpenPgpApi.RESULT_INTENT);
pi.send(); pi.send();
Thread.sleep(ACTIVITY_WAIT_TIME * 1000); // Wait for activity to start Thread.sleep(ACTIVITY_WAIT_TIME); // Wait for activity to start
onData(withKeyItemId(0x9D604D2F310716A3L)) onData(withKeyItemId(0x9D604D2F310716A3L))
.inAdapterView(isAssignableFrom(AdapterView.class)) .inAdapterView(isAssignableFrom(AdapterView.class))
.perform(click()); .perform(click());
@@ -143,7 +143,7 @@ public class OpenPgpServiceTest {
PendingIntent pi = result.getParcelableExtra(OpenPgpApi.RESULT_INTENT); PendingIntent pi = result.getParcelableExtra(OpenPgpApi.RESULT_INTENT);
pi.send(); pi.send();
Thread.sleep(ACTIVITY_WAIT_TIME * 1000); // Wait for activity to start Thread.sleep(ACTIVITY_WAIT_TIME); // Wait for activity to start
onView(withId(R.id.passphrase_passphrase)).perform(typeText("x")); onView(withId(R.id.passphrase_passphrase)).perform(typeText("x"));
// Needed to correctly execute test on Travis // Needed to correctly execute test on Travis