real test

Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>

.github/workflows/endToEndTest.yml

@@ -83,6 +83,7 @@ jobs:
             -   name: Build gplay
                 run: |
                     sed -i s#http://server#http://10.0.2.2# gradle.properties
+                    sed -i s'#<bool name="is_beta">false</bool>#<bool name="is_beta">true</bool>#'g app/src/main/res/values/setup.xml
                     ./gradlew assembleGplayDebug
 
             -   name: Delete old comments
@@ -91,7 +92,7 @@ jobs:
                 if: ${{ always() }}
                 run: scripts/deleteOldComments.sh "${{ matrix.color }}-${{ matrix.scheme }}" "Screenshot" ${{github.event.number}}
 
-            -   name: Run screenshot tests
+            -   name: gplay
                 env:
                     SHOT_TEST: "true"
                 uses: reactivecircus/android-emulator-runner@6b0df4b0efb23bb0ec63d881db79aefbc976e4b2 # v2.30.1
@@ -102,7 +103,7 @@ jobs:
                     sdcard-path-or-size: 100M
                     target: google_apis
                     emulator-options: -no-window -gpu swiftshader_indirect -no-snapshot -noaudio -no-boot-anim -skin 500x833
-                    script: scripts/wait_for_emulator.sh &&  ./gradlew createGplayDebugCoverageReport -Pcoverage
+                    script: scripts/wait_for_emulator.sh &&  scripts/runCombinedTest.sh $DRONE_PULL_REQUEST $LOG_USERNAME $LOG_PASSWORD $DRONE_BUILD_NUMBER
 
             -   name: upload failing results
                 if: ${{ failure() }}

gradle.properties

@@ -21,4 +21,4 @@ org.gradle.parallel=true
 org.gradle.configureondemand=true
 
 # Needed for local libs
-# org.gradle.dependency.verification=lenient
+# org.gradle.dependency.verification=lenient

scripts/runCombinedTest.sh

@@ -40,6 +40,9 @@ stat=$?
 # stop saving logcat
 kill $LOGCAT_PID
 
+echo "Exit with: " $stat
+exit $stat
+
 if [ ! $stat -eq 0 ]; then
     upload_logcat
     bash scripts/uploadReport.sh "$LOG_USERNAME" "$LOG_PASSWORD" "$DRONE_BUILD_NUMBER" "master" "IT" "$DRONE_PULL_REQUEST"
@@ -48,6 +51,3 @@ fi
 curl -Os https://uploader.codecov.io/latest/linux/codecov
 chmod +x codecov
 ./codecov -t fc506ba4-33c3-43e4-a760-aada38c24fd5 -F integration
-
-echo "Exit with: " $stat
-exit $stat