Skip to content

Commit 53b4f22

Browse files
committed
Test updates needed in order to be able to test quoted string changes in the cli
1 parent 497567b commit 53b4f22

3 files changed

Lines changed: 28 additions & 10 deletions

File tree

tests/src/test/scala/common/BaseWsk.scala

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -284,10 +284,13 @@ trait BaseActivation extends BaseRunWsk {
284284
def get(activationId: Option[String] = None,
285285
expectedExitCode: Int = SUCCESS_EXIT,
286286
fieldFilter: Option[String] = None,
287-
last: Option[Boolean] = None)(implicit wp: WskProps): RunResult
287+
last: Option[Boolean] = None,
288+
summary: Option[Boolean] = None)(implicit wp: WskProps): RunResult
288289

289-
def console(duration: Duration, since: Option[Duration] = None, expectedExitCode: Int = SUCCESS_EXIT)(
290-
implicit wp: WskProps): RunResult
290+
def console(duration: Duration,
291+
since: Option[Duration] = None,
292+
expectedExitCode: Int = SUCCESS_EXIT,
293+
actionName: Option[String] = None)(implicit wp: WskProps): RunResult
291294

292295
def logs(activationId: Option[String] = None, expectedExitCode: Int = SUCCESS_EXIT, last: Option[Boolean] = None)(
293296
implicit wp: WskProps): RunResult

tests/src/test/scala/common/Wsk.scala

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -499,10 +499,17 @@ class WskActivation() extends RunWskCmd with HasActivation with WaitFor with Bas
499499
*
500500
* @param duration exits console after duration
501501
* @param since (optional) time travels back to activation since given duration
502+
* @param actionName (optional) name of entity to filter activation records on.
502503
*/
503-
override def console(duration: Duration, since: Option[Duration] = None, expectedExitCode: Int = SUCCESS_EXIT)(
504-
implicit wp: WskProps): RunResult = {
505-
val params = Seq(noun, "poll", "--auth", wp.authKey, "--exit", duration.toSeconds.toString) ++ {
504+
override def console(duration: Duration,
505+
since: Option[Duration] = None,
506+
expectedExitCode: Int = SUCCESS_EXIT,
507+
actionName: Option[String] = None)(implicit wp: WskProps): RunResult = {
508+
val params = Seq(noun, "poll") ++ {
509+
actionName map { name =>
510+
Seq(name)
511+
} getOrElse Seq()
512+
} ++ Seq("--auth", wp.authKey, "--exit", duration.toSeconds.toString) ++ {
506513
since map { s =>
507514
Seq("--since-seconds", s.toSeconds.toString)
508515
} getOrElse Seq()
@@ -563,7 +570,8 @@ class WskActivation() extends RunWskCmd with HasActivation with WaitFor with Bas
563570
override def get(activationId: Option[String] = None,
564571
expectedExitCode: Int = SUCCESS_EXIT,
565572
fieldFilter: Option[String] = None,
566-
last: Option[Boolean] = None)(implicit wp: WskProps): RunResult = {
573+
last: Option[Boolean] = None,
574+
summary: Option[Boolean] = None)(implicit wp: WskProps): RunResult = {
567575
val params = {
568576
activationId map { a =>
569577
Seq(a)
@@ -576,6 +584,10 @@ class WskActivation() extends RunWskCmd with HasActivation with WaitFor with Bas
576584
last map { l =>
577585
Seq("--last")
578586
} getOrElse Seq()
587+
} ++ {
588+
summary map { s =>
589+
Seq("--summary")
590+
} getOrElse Seq()
579591
}
580592
cli(wp.overrides ++ Seq(noun, "get", "--auth", wp.authKey) ++ params, expectedExitCode)
581593
}

tests/src/test/scala/common/rest/WskRest.scala

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -617,8 +617,10 @@ class WskRestActivation extends RunWskRestCmd with HasActivationRest with WaitFo
617617
* @param duration exits console after duration
618618
* @param since (optional) time travels back to activation since given duration
619619
*/
620-
override def console(duration: Duration, since: Option[Duration] = None, expectedExitCode: Int = SUCCESS_EXIT)(
621-
implicit wp: WskProps): RestResult = {
620+
override def console(duration: Duration,
621+
since: Option[Duration] = None,
622+
expectedExitCode: Int = SUCCESS_EXIT,
623+
actionName: Option[String] = None)(implicit wp: WskProps): RestResult = {
622624
require(duration > 1.second, "duration must be at least 1 second")
623625
val sinceTime = {
624626
val now = System.currentTimeMillis()
@@ -743,7 +745,8 @@ class WskRestActivation extends RunWskRestCmd with HasActivationRest with WaitFo
743745
override def get(activationId: Option[String],
744746
expectedExitCode: Int = OK.intValue,
745747
fieldFilter: Option[String] = None,
746-
last: Option[Boolean] = None)(implicit wp: WskProps): RestResult = {
748+
last: Option[Boolean] = None,
749+
summary: Option[Boolean] = None)(implicit wp: WskProps): RestResult = {
747750
val r = activationId match {
748751
case Some(id) => {
749752
val resp = requestEntity(GET, getNamePath(noun, id))

0 commit comments

Comments
 (0)