Karl/BobStore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'fix-emulator-tests' into 'master'

Browse Source 
Fix emulator tests

See merge request fdroid/fdroidclient!816
This commit is contained in:
Hans-Christoph Steiner 2019-04-25 22:57:08 +00:00
commit 080f93eb9c
3 changed files with 22 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
.gitlab-ci.yml
View File

@ -67,10 +67,17 @@ errorprone:
- echo $AVD_PACKAGE - echo $AVD_PACKAGE
- emulator -accel-check || true - emulator -accel-check || true
# Use bleeding edge for Q, or download proven emulator version, based on
# https://aur.archlinux.org/android-emulator.git
- if [[ "$AVD_SDK" == Q ]]; then - if [[ "$AVD_SDK" == Q ]]; then
set -x; echo y | sdkmanager --channel=3 "emulator" > /dev/null; set +x; set -x; echo y | sdkmanager --channel=3 "emulator" > /dev/null; set +x;
- elif [[ "$AVD_ARCH" != arm* ]]; then else
set -x; echo y | sdkmanager "emulator" > /dev/null; set +x; set -x;
rm -rf $ANDROID_HOME/emulator;
wget -q http://dl.google.com/android/repository/emulator-linux-5264690.zip;
echo "48c1cda2bdf3095d9d9d5c010fbfb3d6d673e3ea emulator-linux-5264690.zip" | sha1sum -c;
unzip -qq -d $ANDROID_HOME emulator-linux-5264690.zip;
set +x;
fi fi
- grep Revision $ANDROID_HOME/emulator/source.properties - grep Revision $ANDROID_HOME/emulator/source.properties
@ -81,14 +88,15 @@ errorprone:
rm -rf ~/.android/avd $ANDROID_HOME/system-images; rm -rf ~/.android/avd $ANDROID_HOME/system-images;
echo y | sdkmanager "$AVD_PACKAGE" > /dev/null; echo y | sdkmanager "$AVD_PACKAGE" > /dev/null;
echo no | avdmanager create avd --name avd$AVD_SDK --tag "$AVD_TAG" --package "$AVD_PACKAGE" --sdcard 64M --device "Nexus 5"; echo no | avdmanager create avd --name avd$AVD_SDK --tag "$AVD_TAG" --package "$AVD_PACKAGE" --sdcard 64M --device "Nexus 5";
export RAMSIZE="$((`sed -n 's,^MemAvailable:[^0-9]*\([0-9][0-9]*\)[^0-9]*$,\1,p' /proc/meminfo` * 3 / 4 / 1024))"; export RAMSIZE="`sed -n 's,^MemAvailable:[^0-9]*\([0-9][0-9]*\)[^0-9]*$,\1,p' /proc/meminfo`";
if [ $RAMSIZE -lt 4096 ]; then if [ $RAMSIZE -le 2048 ]; then
sed -i '/^hw\.ramSize\s*=.*/d' ~/.android/avd/*.avd/config.ini; sed -i '/^hw\.ramSize\s*=.*/d' ~/.android/avd/*.avd/config.ini;
echo "hw.ramSize=$RAMSIZE" >> ~/.android/avd/*.avd/config.ini; echo "hw.ramSize=1024" >> ~/.android/avd/*.avd/config.ini;
fi; fi;
avdmanager list avd; avdmanager list avd;
set +x; set +x;
fi fi
- grep -v '^License' $ANDROID_HOME/system-images/android-$AVD_SDK/$AVD_TAG/$AVD_ARCH/source.properties
- adb start-server - adb start-server
- ls -l ~/.android - ls -l ~/.android
- emulator -version - emulator -version
@ -105,8 +113,11 @@ errorprone:
- wait-for-emulator - wait-for-emulator
- adb devices - adb devices
- adb shell input keyevent 82 & - 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) - ./gradlew connectedFullDebugAndroidTest $FLAG
|| ./gradlew connectedFullDebugAndroidTest $FLAG
|| ./gradlew connectedFullDebugAndroidTest $FLAG
|| (adb -e logcat -d > logcat.txt; exit 1)
connected 22 default armeabi-v7a: connected 22 default armeabi-v7a:
retry: 1 retry: 1

3
.weblate Normal file
View File

@ -0,0 +1,3 @@
[weblate]
url = https://hosted.weblate.org/api/
translation = f-droid/f-droid

1
app/src/androidTest/java/org/fdroid/fdroid/MainActivityEspressoTest.java
View File

@ -49,6 +49,7 @@ import static org.hamcrest.Matchers.not;
import static org.junit.Assert.assertTrue; import static org.junit.Assert.assertTrue;
import static org.junit.Assume.assumeTrue; import static org.junit.Assume.assumeTrue;
@LargeTest
@RunWith(AndroidJUnit4.class) @RunWith(AndroidJUnit4.class)
public class MainActivityEspressoTest { public class MainActivityEspressoTest {
public static final String TAG = "MainActivityEspressoTest"; public static final String TAG = "MainActivityEspressoTest";