Merge pull request #14453 from nextcloud/failOnServerFail

do not continue when server fails
nextcloud · Jan 23, 2025 · 890464a · 890464a
2 parents 11e4d2b + 56f3b2d
commit 890464a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/app/src/main/java/com/owncloud/android/MainApp.java b/app/src/main/java/com/owncloud/android/MainApp.java
@@ -142,6 +142,7 @@ public class MainApp extends Application implements HasAndroidInjector, NetworkC
     private static boolean mOnlyOnDevice;
     private static boolean mOnlyPersonalFiles;
 
+
     @Inject
     protected AppPreferences preferences;
 

diff --git a/scripts/runCombinedTest.sh b/scripts/runCombinedTest.sh
@@ -23,10 +23,10 @@ scripts/deleteOldComments.sh "master" "IT" "$DRONE_PULL_REQUEST"
 
 ./gradlew assembleGplayDebugAndroidTest
 
-scripts/wait_for_emulator.sh
+scripts/wait_for_emulator.sh || exit 1
 
 ./gradlew installGplayDebugAndroidTest
-scripts/wait_for_server.sh "server"
+scripts/wait_for_server.sh "server" || exit 1
 
 # clear logcat and start saving it to file
 adb logcat -c
-Original file line number
+Diff line change
@@ Expand Up @@
         private static boolean mOnlyOnDevice;
         private static boolean mOnlyPersonalFiles;
         @Inject
         protected AppPreferences preferences;
@@ Expand Down @@