openwhisk-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From csantan...@apache.org
Subject [incubator-openwhisk-cli] 08/10: Port Controller from Spray to Akka (#2218)
Date Thu, 17 Aug 2017 17:17:49 GMT
This is an automated email from the ASF dual-hosted git repository.

csantanapr pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-openwhisk-cli.git

commit 2153503fba1f9801efac5cef612dbef6f2df9329
Author: James Dubee <jwdubee@us.ibm.com>
AuthorDate: Sat Aug 12 10:38:55 2017 -0400

    Port Controller from Spray to Akka (#2218)
    
    * Port Controller from Spray to Akka
    * Increase max-connections and Update JSON Unmarshaller
---
 tests/src/test/scala/system/basic/WskSequenceTests.scala          | 6 +++++-
 tests/src/test/scala/whisk/core/cli/test/WskWebActionsTests.scala | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/tests/src/test/scala/system/basic/WskSequenceTests.scala b/tests/src/test/scala/system/basic/WskSequenceTests.scala
index 0c023c9..6151968 100644
--- a/tests/src/test/scala/system/basic/WskSequenceTests.scala
+++ b/tests/src/test/scala/system/basic/WskSequenceTests.scala
@@ -35,9 +35,13 @@ import common.Wsk
 import common.WhiskProperties
 import common.WskProps
 import common.WskTestHelpers
+
+import akka.http.scaladsl.testkit.ScalatestRouteTest
+
 import spray.json._
 import spray.json.DefaultJsonProtocol._
-import spray.testkit.ScalatestRouteTest
+
+import whisk.core.WhiskConfig
 import whisk.http.Messages.sequenceIsTooLong
 
 /**
diff --git a/tests/src/test/scala/whisk/core/cli/test/WskWebActionsTests.scala b/tests/src/test/scala/whisk/core/cli/test/WskWebActionsTests.scala
index 070f356..0f67588 100644
--- a/tests/src/test/scala/whisk/core/cli/test/WskWebActionsTests.scala
+++ b/tests/src/test/scala/whisk/core/cli/test/WskWebActionsTests.scala
@@ -295,7 +295,7 @@ trait WskWebActionsTests
             val url = host + s"$testRoutePath/$namespace/default/webaction.http"
             val response = RestAssured.given().header("accept", "application/json").config(sslconfig).get(url)
             response.statusCode shouldBe 406
-            response.body.asString should include("Resource representation is only available
with these Content-Types:\\ntext/html")
+            response.body.asString should include("Resource representation is only available
with these types:\\ntext/html")
     }
 
     it should "support multiple response header values" in withAssetCleaner(wskprops) {

-- 
To stop receiving notification emails like this one, please contact
"commits@openwhisk.apache.org" <commits@openwhisk.apache.org>.

Mime
View raw message