You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openwhisk.apache.org by cs...@apache.org on 2018/03/18 03:36:59 UTC
[incubator-openwhisk] branch master updated: wsk test framework
update to support --web-secure cli option (#3455)
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 2d055dc wsk test framework update to support --web-secure cli option (#3455)
2d055dc is described below
commit 2d055dcfa72b86f50dac6b3a5d372430189c0000
Author: Mark Deuser <md...@us.ibm.com>
AuthorDate: Sat Mar 17 23:36:56 2018 -0400
wsk test framework update to support --web-secure cli option (#3455)
---
tests/src/test/scala/common/BaseWsk.scala | 1 +
tests/src/test/scala/common/Wsk.scala | 5 +++++
tests/src/test/scala/common/rest/WskRest.scala | 1 +
3 files changed, 7 insertions(+)
diff --git a/tests/src/test/scala/common/BaseWsk.scala b/tests/src/test/scala/common/BaseWsk.scala
index 228ef40..1bef64b 100644
--- a/tests/src/test/scala/common/BaseWsk.scala
+++ b/tests/src/test/scala/common/BaseWsk.scala
@@ -204,6 +204,7 @@ trait BaseAction extends BaseRunWsk with BaseDeleteFromCollection with BaseListO
shared: Option[Boolean] = None,
update: Boolean = false,
web: Option[String] = None,
+ websecure: Option[String] = None,
expectedExitCode: Int = SUCCESS_EXIT)(implicit wp: WskProps): RunResult
def invoke(name: String,
diff --git a/tests/src/test/scala/common/Wsk.scala b/tests/src/test/scala/common/Wsk.scala
index 44d5c95..e15f030 100644
--- a/tests/src/test/scala/common/Wsk.scala
+++ b/tests/src/test/scala/common/Wsk.scala
@@ -249,6 +249,7 @@ class WskAction()
shared: Option[Boolean] = None,
update: Boolean = false,
web: Option[String] = None,
+ websecure: Option[String] = None,
expectedExitCode: Int = SUCCESS_EXIT)(implicit wp: WskProps): RunResult = {
val params = Seq(noun, if (!update) "create" else "update", "--auth", wp.authKey, fqn(name)) ++ {
artifact map { Seq(_) } getOrElse Seq()
@@ -301,6 +302,10 @@ class WskAction()
web map { w =>
Seq("--web", w)
} getOrElse Seq()
+ } ++ {
+ websecure map { ws =>
+ Seq("--web-secure", ws)
+ } getOrElse Seq()
}
cli(wp.overrides ++ params, expectedExitCode)
}
diff --git a/tests/src/test/scala/common/rest/WskRest.scala b/tests/src/test/scala/common/rest/WskRest.scala
index 71ec04a..61df948 100644
--- a/tests/src/test/scala/common/rest/WskRest.scala
+++ b/tests/src/test/scala/common/rest/WskRest.scala
@@ -299,6 +299,7 @@ class WskRestAction
shared: Option[Boolean] = None,
update: Boolean = false,
web: Option[String] = None,
+ websecure: Option[String] = None,
expectedExitCode: Int = OK.intValue)(implicit wp: WskProps): RestResult = {
val (namespace, actName) = getNamespaceEntityName(name)
--
To stop receiving notification emails like this one, please contact
csantanapr@apache.org.