This is an automated email from the ASF dual-hosted git repository.
cbickel 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 cc72113 Soften DockerExampleContainerTests. (#3368)
cc72113 is described below
commit cc72113d33562a1297c90f2a32d07c8537fadd04
Author: Markus Thömmes <[email protected]>
AuthorDate: Wed Feb 28 13:45:05 2018 +0100
Soften DockerExampleContainerTests. (#3368)
This test fails in different environments with different exceptions. This
commit only aims to resolve the immediate issue.
---
.../src/test/scala/actionContainers/DockerExampleContainerTests.scala | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git
a/tests/src/test/scala/actionContainers/DockerExampleContainerTests.scala
b/tests/src/test/scala/actionContainers/DockerExampleContainerTests.scala
index c5bfdba..a28b611 100644
--- a/tests/src/test/scala/actionContainers/DockerExampleContainerTests.scala
+++ b/tests/src/test/scala/actionContainers/DockerExampleContainerTests.scala
@@ -137,10 +137,12 @@ class DockerExampleContainerTests extends
ActionProxyContainerTestUtils with Wsk
it should "timeout bad proxy with exception" in {
val (out, err) = withContainer("badproxy") { c =>
- an[IllegalStateException] should be thrownBy {
+ val ex = the[Exception] thrownBy {
val (code, out) = c.init(JsObject())
println(code, out)
}
+
+ ex should (be(a[TimeoutException]) or be(a[IllegalStateException]))
}
out shouldBe empty
--
To stop receiving notification emails like this one, please contact
[email protected].
