[incubator-openwhisk] branch master updated: Remove unneeded code reference from WhiskActionMetaData test helper (#3080)

[cs...@apache.org]

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 02626d7  Remove unneeded code reference from WhiskActionMetaData test helper (#3080)
02626d7 is described below

commit 02626d7bb2dd4b10959d059c32af0302c5a5d639
Author: James Dubee <jw...@us.ibm.com>
AuthorDate: Sat Dec 9 15:28:36 2017 -0500

    Remove unneeded code reference from WhiskActionMetaData test helper (#3080)
---
 .../test/scala/whisk/core/controller/test/WebActionsApiTests.scala  | 2 +-
 tests/src/test/scala/whisk/core/entity/test/ExecHelpers.scala       | 6 +-----
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/tests/src/test/scala/whisk/core/controller/test/WebActionsApiTests.scala b/tests/src/test/scala/whisk/core/controller/test/WebActionsApiTests.scala
index 9f5acad..57c8401 100644
--- a/tests/src/test/scala/whisk/core/controller/test/WebActionsApiTests.scala
+++ b/tests/src/test/scala/whisk/core/controller/test/WebActionsApiTests.scala
@@ -190,7 +190,7 @@ trait WebActionsApiBaseTests extends ControllerTestCommon with BeforeAndAfterEac
         WhiskActionMetaData(
           actionName.path,
           actionName.name,
-          jsDefaultMetaData("??"),
+          js6MetaData(),
           defaultActionParameters,
           annotations = {
             if (actionName.name.asString.startsWith("export_")) {
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 2114157..c0f4ea8 100644
--- a/tests/src/test/scala/whisk/core/entity/test/ExecHelpers.scala
+++ b/tests/src/test/scala/whisk/core/entity/test/ExecHelpers.scala
@@ -68,15 +68,11 @@ trait ExecHelpers extends Matchers with WskActorSystem with StreamLogging {
     js6(code, main)
   }
 
-  protected def js6MetaData(code: String, main: Option[String] = None) = {
+  protected def js6MetaData(main: Option[String] = None) = {
     CodeExecMetaDataAsString(
       RuntimeManifest(NODEJS6, imagename(NODEJS6), default = Some(true), deprecated = Some(false)))
   }
 
-  protected def jsDefaultMetaData(code: String, main: Option[String] = None) = {
-    js6MetaData(code, main)
-  }
-
   protected def javaDefault(code: String, main: Option[String] = None) = {
     val attachment = attFmt[String].read(code.trim.toJson)
     val manifest = ExecManifest.runtimesManifest.resolveDefaultRuntime(JAVA_DEFAULT).get

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