Update Readme. Also improvements in params check to avoid misleading …

…log.
shazam · Apr 11, 2016 · 051307a · 051307a
1 parent 6e13843
commit 051307a
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 11 deletions.
diff --git a/README.md b/README.md
@@ -69,16 +69,19 @@ Will potentially be unsupported, as it's the least developer friendly. Check out
 ```
 > gradlew fork-runner:run -Pargs='ARGUMENTS LIST'
 
-With the below options.       The APK and test APK parameters are mandatory:
-    --sdk                     Path to Android SDK. Defaults to the ANDROID_HOME environment variable.
-    --apk                     Path to application. This parameter is required.
-    --test-apk                Path to test application. This parameter is required.
-    --output                  Output path. Defaults to "fork-output"
-    --test-package            The package to consider when finding tests to run. Defaults to instrumentation package.
-    --test-class-regex        Regex determining class names to consider when finding tests to run. Defaults to ^((?!Abstract).)*Test$
-    --test-timeout            The maximum amount of time during which the tests are allowed to not output any response, in milliseconds
-    --fail-on-failure         Non-zero exit code on failure. Defaults to false.
-    --fallback-to-screenshots If a device does not support videos, define if you'd like animated GIFs (experimental). Defaults to true.
+With the below options.         The APK and test APK parameters are mandatory:
+    --sdk                       Path to Android SDK. Defaults to the ANDROID_HOME environment variable.
+    --apk                       Path to application. This parameter is required.
+    --test-apk                  Path to test application. This parameter is required.
+    --output                    Output path. Defaults to "fork-output"
+    --test-package              The package to consider when finding tests to run. Defaults to instrumentation package.
+    --test-class-regex          Regex determining class names to consider when finding tests to run. Defaults to ^((?!Abstract).)*Test$
+    --test-timeout              The maximum amount of time during which the tests are allowed to not output any response, in milliseconds
+    --fail-on-failure           Non-zero exit code on failure. Defaults to false.
+    --fallback-to-screenshots   If a device does not support videos, define if you'd like animated GIFs (experimental). Defaults to true.
+    --total-allowed-retry-quota Total amount of allowed retries. If a test case fails and this quota hasn't been exhausted yet,
+                                the test case is scheduled to be executed again in the same device pool. Default to 0;
+    --retry-per-test-case-quota Amount of times a single test can be re-executed before declaring it a failure. Default to 1.
 ```
 
 For example:

diff --git a/fork-runner/src/main/java/com/shazam/fork/ForkBuilder.java b/fork-runner/src/main/java/com/shazam/fork/ForkBuilder.java
@@ -176,7 +176,7 @@ public Fork build() {
     }
 
     private void logArgumentsBadInteractions() {
-        if(totalAllowedRetryQuota < retryPerTestCaseQuota){
+        if(totalAllowedRetryQuota > 0 && totalAllowedRetryQuota < retryPerTestCaseQuota){
             logger.warn("Total allowed retry quota ["+totalAllowedRetryQuota+"] " +
                     "is smaller than Retry per test case quota ["+retryPerTestCaseQuota+"]. " +
                     "This is suspicious as the fist mentioned parameter is an overall cap.");