csantanapr closed pull request #3782: Make test-instances of Exec depend on the loaded manifest. URL: https://github.com/apache/incubator-openwhisk/pull/3782
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/tests/src/test/scala/whisk/core/entity/test/ExecHelpers.scala b/tests/src/test/scala/whisk/core/entity/test/ExecHelpers.scala index 7ff281078e..33dd7e17de 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) = { ---------------------------------------------------------------- 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: us...@infra.apache.org With regards, Apache Git Services