jasonpet closed pull request #287: Add retries to log integration test
URL: https://github.com/apache/incubator-openwhisk-cli/pull/287
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git
a/tests/src/test/scala/whisk/core/cli/test/WskCliBasicUsageTests.scala
b/tests/src/test/scala/whisk/core/cli/test/WskCliBasicUsageTests.scala
index dff7897b..245e9551 100644
--- a/tests/src/test/scala/whisk/core/cli/test/WskCliBasicUsageTests.scala
+++ b/tests/src/test/scala/whisk/core/cli/test/WskCliBasicUsageTests.scala
@@ -392,13 +392,15 @@ class WskCliBasicUsageTests extends TestHelpers with
WskTestHelpers {
}
withActivation(wsk.activation, wsk.action.invoke(name)) { activation =>
- val cmd = Seq("activation", "logs", "--strip", activation.activationId)
- val run = wsk.cli(cmd ++ wskprops.overrides ++ auth,
- expectedExitCode = SUCCESS_EXIT)
- run.stdout should {
- be("this is stdout\nthis is stderr\n") or
- be("this is stderr\nthis is stdout\n")
- }
+ retry({
+ val cmd = Seq("activation", "logs", "--strip",
activation.activationId)
+ val run = wsk.cli(cmd ++ wskprops.overrides ++ auth,
+ expectedExitCode = SUCCESS_EXIT)
+ run.stdout should {
+ be("this is stdout\nthis is stderr\n") or
+ be("this is stderr\nthis is stdout\n")
+ }
+ }, 10, Some(1.second))
}
}
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
With regards,
Apache Git Services