[GitHub] cbickel closed pull request #3368: Soften DockerExampleContainerTests.

[GitBox <gi...@apache.org>]

cbickel closed pull request #3368: Soften DockerExampleContainerTests.
URL: https://github.com/apache/incubator-openwhisk/pull/3368
 
 
   

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/actionContainers/DockerExampleContainerTests.scala b/tests/src/test/scala/actionContainers/DockerExampleContainerTests.scala
index c5bfdbaf4b..a28b611e67 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


 

----------------------------------------------------------------
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:
users@infra.apache.org


With regards,
Apache Git Services