Skip to content

Commit 515d0dd

Browse files
rabbahVincent
authored andcommitted
Enable v2 views. (#2762)
* Enable v2 views. * Adjust console test in REST client eventhough this test makes no sense to me here.
1 parent 6fffec7 commit 515d0dd

2 files changed

Lines changed: 8 additions & 9 deletions

File tree

tests/src/test/scala/system/basic/WskConsoleTests.scala

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -74,18 +74,18 @@ abstract class WskConsoleTests extends TestHelpers with WskTestHelpers {
7474
// Time recorded by invoker, some contingency to make query more robust
7575
val queryTime = activation.start.minusMillis(500)
7676
// since: poll for activations since specified point in time (absolute)
77-
val activations = wsk.activation.pollFor(N = 1, Some(actionName), since = Some(queryTime), retries = 80).length
77+
val activations =
78+
wsk.activation.pollFor(N = 1, Some(s"$packageName/$actionName"), since = Some(queryTime), retries = 80).length
7879
withClue(
79-
s"expected activations of action '${actionName}' since ${queryTime.toString} / initial activation ${activation.activationId}:") {
80+
s"expected activations of action '$fullActionName' since $queryTime, initial activation ${activation.activationId}:") {
8081
activations should be(1)
8182
}
8283

8384
val duration = Duration(Instant.now.minusMillis(start.toEpochMilli).toEpochMilli, MILLISECONDS)
8485
val pollTime = 10 seconds
8586
// since: poll for activations since specified number of seconds ago (relative)
8687
val console = wsk.activation.console(pollTime, since = Some(duration))
87-
withClue(
88-
s"Poll for ${pollTime.toSeconds} seconds since ${duration.toSeconds} seconds did not return expected result:") {
88+
withClue(s"Polled since ${duration.toSeconds} seconds, did not find expected result:") {
8989
console.stdout should include(payload)
9090
}
9191
}
@@ -108,15 +108,14 @@ abstract class WskConsoleTests extends TestHelpers with WskTestHelpers {
108108
// since: poll for activations since specified point in time (absolute)
109109
val activations = wsk.activation.pollFor(N = 4, Some(name), since = Some(queryTime), retries = 80).length
110110
withClue(
111-
s"expected activations of action '${name}' since ${queryTime.toString} / initial activation ${activation.activationId}:") {
111+
s"expected activations of action '$name' since $queryTime, initial activation ${activation.activationId}:") {
112112
activations should be(count + 1)
113113
}
114114
val duration = Duration(Instant.now.minusMillis(start.toEpochMilli).toEpochMilli, MILLISECONDS)
115115
val pollTime = 10 seconds
116116
// since: poll for activations since specified number of seconds ago (relative)
117117
val console = wsk.activation.console(pollTime, since = Some(duration))
118-
withClue(
119-
s"Poll for ${pollTime.toSeconds} seconds since ${duration.toSeconds} seconds did not return expected result:") {
118+
withClue(s"Polled for ${duration.toSeconds} seconds, did not find expected result:") {
120119
console.stdout should include("Happy New Year")
121120
}
122121
}

tests/src/test/scala/system/basic/WskRuleTests.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ abstract class WskRuleTests extends TestHelpers with WskTestHelpers {
147147

148148
withActivationsFromEntity(
149149
wsk.activation,
150-
actionName,
150+
pkgActionName,
151151
since = Some(triggerActivation.start.minusMillis(activationTimeSkewFactorMs))) {
152152
_.head.response.result shouldBe Some(testResult)
153153
}
@@ -187,7 +187,7 @@ abstract class WskRuleTests extends TestHelpers with WskTestHelpers {
187187

188188
withActivationsFromEntity(
189189
wsk.activation,
190-
actionName,
190+
pkgActionName,
191191
since = Some(triggerActivation.start.minusMillis(activationTimeSkewFactorMs))) {
192192
_.head.response.result shouldBe Some(testResult)
193193
}

0 commit comments

Comments
 (0)