From b8dba454e3612e7f3a0a3eaa4e69e7db2f70e507 Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Tue, 23 Apr 2019 14:46:10 +0200 Subject: [PATCH] gitlab-ci: only run Espresso tests on emulators newer than 25 --- .gitlab-ci.yml | 2 +- .../java/org/fdroid/fdroid/MainActivityEspressoTest.java | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 31253807a..01fabfa8c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -105,7 +105,7 @@ errorprone: - wait-for-emulator - adb devices - adb shell input keyevent 82 & - - test $AVD_SDK -ge 25 || export FLAG=-Pandroid.testInstrumentationRunnerArguments.notAnnotation=android.test.suitebuilder.annotation.LargeTest + - test $AVD_SDK -ge 25 || export FLAG=-Pandroid.testInstrumentationRunnerArguments.notAnnotation=android.support.test.filters.LargeTest - ./gradlew connectedFullDebugAndroidTest $FLAG || (adb -e logcat -d > logcat.txt; exit 1) connected 22 default armeabi-v7a: diff --git a/app/src/androidTest/java/org/fdroid/fdroid/MainActivityEspressoTest.java b/app/src/androidTest/java/org/fdroid/fdroid/MainActivityEspressoTest.java index 3e23f3ed6..127216a04 100644 --- a/app/src/androidTest/java/org/fdroid/fdroid/MainActivityEspressoTest.java +++ b/app/src/androidTest/java/org/fdroid/fdroid/MainActivityEspressoTest.java @@ -49,6 +49,7 @@ import static org.hamcrest.Matchers.not; import static org.junit.Assert.assertTrue; import static org.junit.Assume.assumeTrue; +@LargeTest @RunWith(AndroidJUnit4.class) public class MainActivityEspressoTest { public static final String TAG = "MainActivityEspressoTest";