This is an automated email from the ASF dual-hosted git repository.
rabbah pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-openwhisk.git
The following commit(s) were added to refs/heads/master by this push:
new 14c271e Fix intermittent test failure related to sequence execution
error propagation (#4340)
14c271e is described below
commit 14c271e2644228f7e4ddee6bf8628df2d7ea7c0d
Author: James Dubee <[email protected]>
AuthorDate: Fri Mar 15 13:23:57 2019 -0400
Fix intermittent test failure related to sequence execution error
propagation (#4340)
---
tests/src/test/scala/system/basic/WskSequenceTests.scala | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/tests/src/test/scala/system/basic/WskSequenceTests.scala
b/tests/src/test/scala/system/basic/WskSequenceTests.scala
index dd2a6dd..6d0d23f 100644
--- a/tests/src/test/scala/system/basic/WskSequenceTests.scala
+++ b/tests/src/test/scala/system/basic/WskSequenceTests.scala
@@ -33,7 +33,7 @@ import common.rest.WskRestOperations
import spray.json._
import spray.json.DefaultJsonProtocol._
import system.rest.RestUtil
-import org.apache.openwhisk.http.Messages.sequenceIsTooLong
+import org.apache.openwhisk.http.Messages._
/**
* Tests sequence execution
@@ -365,9 +365,9 @@ class WskSequenceTests extends TestHelpers with
WskTestHelpers with StreamLoggin
// the status should be error
//activation.response.status shouldBe("application error")
val result = activation.response.result.get
- // the result of the activation should be timeout
- result shouldBe (JsObject(
- "error" -> JsString("The action exceeded its time limits of 10000
milliseconds during initialization.")))
+ // the result of the activation should be timeout or an abnormal
initialization
+ result should (be(JsObject("error" ->
timedoutActivation(shortDuration, true).toJson)) or be(
+ JsObject("error" -> abnormalInitialization.toJson)))
}
}
