[GitHub] tysonnorris closed pull request #54: new akka client throws IllegalStateException

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

tysonnorris closed pull request #54: new akka client throws IllegalStateException 
URL: https://github.com/apache/incubator-openwhisk-runtime-docker/pull/54
 
 
   

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/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index d7cc33f..0860a88 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -5,4 +5,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.8.1-bin.zip
diff --git a/tests/src/test/scala/runtime/actionContainers/DockerExampleContainerTests.scala b/tests/src/test/scala/runtime/actionContainers/DockerExampleContainerTests.scala
index b451bfd..0d706ef 100644
--- a/tests/src/test/scala/runtime/actionContainers/DockerExampleContainerTests.scala
+++ b/tests/src/test/scala/runtime/actionContainers/DockerExampleContainerTests.scala
@@ -133,7 +133,7 @@ class DockerExampleContainerTests extends ActionProxyContainerTestUtils with Wsk
 
   it should "timeout bad proxy with exception" in {
     val (out, err) = withContainer("badproxy") { c =>
-      a[TimeoutException] should be thrownBy {
+      a[IllegalStateException] should be thrownBy {
         val (code, out) = c.init(JsObject())
         println(code, out)
       }
diff --git a/tools/travis/build.sh b/tools/travis/build.sh
index e3aa931..01f3b7d 100755
--- a/tools/travis/build.sh
+++ b/tools/travis/build.sh
@@ -40,4 +40,6 @@ echo "vcap.services.file=" >> whisk.properties
 
 # Build runtime
 cd $ROOTDIR
+cat ./gradle/wrapper/*.properties
+./gradlew --version
 TERM=dumb ./gradlew distDocker
diff --git a/tools/travis/setup.sh b/tools/travis/setup.sh
index af4a1e4..818048f 100755
--- a/tools/travis/setup.sh
+++ b/tools/travis/setup.sh
@@ -16,7 +16,7 @@
 # limitations under the License.
 #
 
-set -e
+set -ex
 
 # Build script for Travis-CI.
 
diff --git a/tools/travis/test.sh b/tools/travis/test.sh
index a5b249d..f426073 100755
--- a/tools/travis/test.sh
+++ b/tools/travis/test.sh
@@ -27,4 +27,9 @@ WHISKDIR="$ROOTDIR/../openwhisk"
 export OPENWHISK_HOME=$WHISKDIR
 cd ${ROOTDIR}
 TERM=dumb ./gradlew :tests:checkScalafmtAll
+
+#debugging ActionContainer staleness
+unzip  ~/.m2/repository/org/apache/openwhisk/openwhisk-tests/1.0.0-SNAPSHOT/openwhisk-tests-1.0.0-SNAPSHOT-test-sources.jar actionContainers/ActionContainer.*
+cat actionContainers/ActionContainer.scala
+
 TERM=dumb ./gradlew :tests:test


 

----------------------------------------------------------------
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