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.git
The following commit(s) were added to refs/heads/master by this push:
new 071d841 Make test-instances of Exec depend on the loaded manifest.
(#3782)
071d841 is described below
commit 071d841bc32f5b4a2712c416752d46488caead22
Author: Markus Thömmes <[email protected]>
AuthorDate: Tue Jun 19 21:05:45 2018 +0200
Make test-instances of Exec depend on the loaded manifest. (#3782)
Exec.serdes very implicitly relies on a manifest to be loaded, which makes
the test-instances of Exec take values from there as well. The hard-coded
versions of those in ExecHelper need to respect those values as well to be
correctly assertable.
---
tests/src/test/scala/whisk/core/entity/test/ExecHelpers.scala | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/tests/src/test/scala/whisk/core/entity/test/ExecHelpers.scala
b/tests/src/test/scala/whisk/core/entity/test/ExecHelpers.scala
index 7ff2810..33dd7e1 100644
--- a/tests/src/test/scala/whisk/core/entity/test/ExecHelpers.scala
+++ b/tests/src/test/scala/whisk/core/entity/test/ExecHelpers.scala
@@ -47,11 +47,7 @@ trait ExecHelpers extends Matchers with WskActorSystem with
StreamLogging {
private def attFmt[T: JsonFormat] = Attachments.serdes[T]
protected def imagename(name: String) = {
- var image = s"${name}action".replace(":", "")
- if (name.equals(SWIFT3)) {
- image = SWIFT3_IMAGE
- }
- ExecManifest.ImageName(image, Some("openwhisk"), Some("latest"))
+ ExecManifest.runtimesManifest.runtimes.flatMap(_.versions).find(_.kind ==
name).get.image
}
protected def js(code: String, main: Option[String] = None) = {
