Retry on any errors.

Author: style95

tests/src/test/scala/common/RunCliCmd.scala

@@ -96,7 +96,7 @@ trait RunCliCmd extends Matchers {
   /** Retries cmd on network error exit. */
   private def retry(i: Int, N: Int, cmd: () => RunResult): RunResult = {
     val rr = cmd()
-    if (rr.exitCode == NETWORK_ERROR_EXIT && i < N) {
+    if (rr.exitCode != SUCCESS_EXIT && i < N) {
       Thread.sleep(1.second.toMillis)
       println(s"command will retry to due to network error: $rr")
       retry(i + 1, N, cmd)

tests/src/test/scala/org/apache/openwhisk/common/RunCliCmdTests.scala

@@ -74,16 +74,16 @@ class RunCliCmdTests extends FlatSpec with RunCliCmd with BeforeAndAfterEach {
     cmdCount shouldBe 1
   }
 
-  it should "not retry commands if failure is not retriable" in {
-    Seq(MISUSE_EXIT, ERROR_EXIT, SUCCESS_EXIT).foreach { code =>
+  it should "retry commands if any failure is happen" in {
+    Seq(MISUSE_EXIT, ERROR_EXIT).foreach { code =>
       cmdCount = 0
 
       rr = Some(TestRunResult(code))
       noException shouldBe thrownBy {
         cli(Seq.empty, expectedExitCode = DONTCARE_EXIT, retriesOnNetworkError = 3)
       }
 
-      cmdCount shouldBe 1
+      cmdCount shouldBe 4
     }
   }