You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openwhisk.apache.org by dg...@apache.org on 2018/07/10 02:13:34 UTC
[incubator-openwhisk] branch master updated: Add bypass for test
(failing in Swift, PHP). Fix NPEs. (#3864)
This is an automated email from the ASF dual-hosted git repository.
dgrove 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 223a168 Add bypass for test (failing in Swift, PHP). Fix NPEs. (#3864)
223a168 is described below
commit 223a168212f3b884a1fe63aa4c937c7b3b21364e
Author: rodric rabbah <ro...@gmail.com>
AuthorDate: Mon Jul 9 22:13:31 2018 -0400
Add bypass for test (failing in Swift, PHP). Fix NPEs. (#3864)
---
.../scala/actionContainers/ActionContainer.scala | 13 +++++++---
.../actionContainers/BasicActionRunnerTests.scala | 30 ++++++++++++----------
tests/src/test/scala/common/WhiskProperties.java | 4 ++-
3 files changed, 28 insertions(+), 19 deletions(-)
diff --git a/tests/src/test/scala/actionContainers/ActionContainer.scala b/tests/src/test/scala/actionContainers/ActionContainer.scala
index b9398cd..a168889 100644
--- a/tests/src/test/scala/actionContainers/ActionContainer.scala
+++ b/tests/src/test/scala/actionContainers/ActionContainer.scala
@@ -21,6 +21,7 @@ import java.io.ByteArrayOutputStream
import java.io.File
import java.io.PrintWriter
+import scala.util.Try
import scala.concurrent.Await
import scala.concurrent.ExecutionContext.Implicits.global
import scala.concurrent.Future
@@ -116,10 +117,14 @@ object ActionContainer {
.get("docker.host")
.orElse(sys.env.get("DOCKER_HOST"))
.orElse {
- // Check if we are running on docker-machine env.
- Option(WhiskProperties.getProperty("environment.type")).filter(_.toLowerCase.contains("docker-machine")).map {
- case _ => s"tcp://${WhiskProperties.getMainDockerEndpoint}"
- }
+ Try { // whisk.properties file may not exist
+ // Check if we are running on docker-machine env.
+ Option(WhiskProperties.getProperty("environment.type"))
+ .filter(_.toLowerCase.contains("docker-machine"))
+ .map {
+ case _ => s"tcp://${WhiskProperties.getMainDockerEndpoint}"
+ }
+ }.toOption.flatten
}
.map(" --host " + _)
.getOrElse("")
diff --git a/tests/src/test/scala/actionContainers/BasicActionRunnerTests.scala b/tests/src/test/scala/actionContainers/BasicActionRunnerTests.scala
index 7831f67..07d028d 100644
--- a/tests/src/test/scala/actionContainers/BasicActionRunnerTests.scala
+++ b/tests/src/test/scala/actionContainers/BasicActionRunnerTests.scala
@@ -297,24 +297,26 @@ trait BasicActionRunnerTests extends ActionProxyContainerTestUtils {
it should s"echo a large input" in {
val config = testLargeInput
- var passed = true
+ if (!config.skipTest) {
+ var passed = true
- val (out, err) = withActionContainer() { c =>
- val (initCode, _) = c.init(initPayload(config.code, config.main))
- initCode should be(200)
+ val (out, err) = withActionContainer() { c =>
+ val (initCode, _) = c.init(initPayload(config.code, config.main))
+ initCode should be(200)
- val arg = JsObject("arg" -> JsString(("a" * 1048561)))
- val (_, runRes) = c.run(runPayload(arg))
- if (runRes.get != arg) {
- println(s"result did not match: ${runRes.get}")
- passed = false
+ val arg = JsObject("arg" -> JsString(("a" * 1048561)))
+ val (_, runRes) = c.run(runPayload(arg))
+ if (runRes.get != arg) {
+ println(s"result did not match: ${runRes.get}")
+ passed = false
+ }
}
- }
- if (!passed) {
- println(out)
- println(err)
- assert(false)
+ if (!passed) {
+ println(out)
+ println(err)
+ assert(false)
+ }
}
}
diff --git a/tests/src/test/scala/common/WhiskProperties.java b/tests/src/test/scala/common/WhiskProperties.java
index 64e9c28..3f20144 100644
--- a/tests/src/test/scala/common/WhiskProperties.java
+++ b/tests/src/test/scala/common/WhiskProperties.java
@@ -295,7 +295,9 @@ public class WhiskProperties {
*/
public static File getVCAPServicesFile() {
String vcapServices = whiskProperties.getProperty("vcap.services.file");
- if (vcapServices.startsWith(File.separator)) {
+ if (vcapServices == null) {
+ return null;
+ } else if (vcapServices.startsWith(File.separator)) {
return new File(vcapServices);
} else {
return WhiskProperties.getFileRelativeToWhiskHome(vcapServices);