You are viewing a plain text version of this content. The canonical link for it is here.
Posted to issues@openwhisk.apache.org by GitBox <gi...@apache.org> on 2018/01/17 13:39:28 UTC
[GitHub] rabbah closed pull request #3190: Code clean up
rabbah closed pull request #3190: Code clean up
URL: https://github.com/apache/incubator-openwhisk/pull/3190
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/common/scala/src/main/scala/whisk/http/BasicHttpService.scala b/common/scala/src/main/scala/whisk/http/BasicHttpService.scala
index 798bb1eff8..7fe51478db 100644
--- a/common/scala/src/main/scala/whisk/http/BasicHttpService.scala
+++ b/common/scala/src/main/scala/whisk/http/BasicHttpService.scala
@@ -60,7 +60,7 @@ trait BasicHttpService extends Directives with TransactionCounter {
*/
def loglevelForRoute(route: String): Logging.LogLevel = Logging.InfoLevel
- /** Rejection handler to terminate connection on a bad request. Delegates to Akka handler. */
+ /** Prioritized rejections based on relevance. */
val prioritizeRejections = recoverRejections { rejections =>
val priorityRejection = rejections.find {
case rejection: UnacceptedResponseContentTypeRejection => true
diff --git a/tests/src/test/scala/system/rest/GoCLINginxTests.scala b/tests/src/test/scala/system/rest/GoCLINginxTests.scala
index a5049a63f5..3621a4d13d 100644
--- a/tests/src/test/scala/system/rest/GoCLINginxTests.scala
+++ b/tests/src/test/scala/system/rest/GoCLINginxTests.scala
@@ -32,10 +32,7 @@ import DefaultJsonProtocol._
*/
@RunWith(classOf[JUnitRunner])
class GoCLINginxTests extends FlatSpec with Matchers with RestUtil {
- val ProductName = "OpenWhisk_CLI"
val DownloadLinkGoCli = "cli/go/download"
- val OperatingSystems = List("mac", "linux", "windows")
- val Architectures = List("386", "amd64")
val ServiceURL = getServiceURL()
it should s"respond to all files in root directory" in {
diff --git a/tests/src/test/scala/whisk/core/controller/test/SwaggerRoutesTests.scala b/tests/src/test/scala/whisk/core/controller/test/SwaggerRoutesTests.scala
index c0d46138e8..acfda89ac6 100644
--- a/tests/src/test/scala/whisk/core/controller/test/SwaggerRoutesTests.scala
+++ b/tests/src/test/scala/whisk/core/controller/test/SwaggerRoutesTests.scala
@@ -23,7 +23,6 @@ import org.scalatest.junit.JUnitRunner
import akka.http.scaladsl.model.StatusCodes._
import akka.http.scaladsl.marshallers.sprayjson.SprayJsonSupport._
-//import akka.http.scaladsl.model.Uri.Query
import akka.http.scaladsl.server.Route
import akka.http.scaladsl.model.Uri
----------------------------------------------------------------
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