You are viewing a plain text version of this content. The canonical link for it is here.
Posted to issues@openwhisk.apache.org by GitBox <gi...@apache.org> on 2018/02/22 06:42:28 UTC
[GitHub] dubeejw commented on a change in pull request #249: Improvements to BasicHealthTest
dubeejw commented on a change in pull request #249: Improvements to BasicHealthTest
URL: https://github.com/apache/incubator-openwhisk-package-kafka/pull/249#discussion_r169866167
##########
File path: tests/src/test/scala/system/health/BasicHealthTest.scala
##########
@@ -93,109 +87,93 @@ class BasicHealthTest
activation =>
// should be successful
activation.response.success shouldBe true
- val uuid = activation.response.result.get.fields.get("uuid").get.toString
+ val uuid = activation.response.result.get.fields.get("uuid").get.toString().replaceAll("\"", "")
+
+ // get /health endpoint(s) and ensure it contains the new uuid
+ val healthUrls = System.getProperty("health_url").split("\\s*,\\s*").filterNot(_.isEmpty)
+ healthUrls shouldNot be(empty)
- // get /health endpoint and ensure it contains the new uuid
retry({
- val response = RestAssured.given().get(System.getProperty("health_url"))
- assert(response.statusCode() == 200 && response.asString().contains(uuid))
+ val uuids = healthUrls.flatMap(u => {
+ val response = RestAssured.given().get(u)
+ response.statusCode() should be(200)
+ response.asString()
+ .parseJson
+ .asJsObject
+ .getFields("consumers")
+ .head
+ .convertTo[JsArray]
+ .elements
+ .flatMap(c => {
+ c.asJsObject.fields.keySet
+ })
+ }).toList
+
+ uuids should contain(uuid)
+
}, N = 3, waitBeforeRetry = Some(1.second))
}
}
it should "fire a trigger when a message is posted to message hub" in withAssetCleaner(wskprops) {
val currentTime = s"${System.currentTimeMillis}"
- val baseTriggerName = "/_/BasicHealthTestTrigger"
+ (wp, assetHelper) =>
+ val triggerName = s"/_/dummyMessageHubTrigger-$currentTime"
+ println(s"Creating trigger $triggerName")
- val triggerName = System.getProperty("trigger.suffix") match {
- case suffix if suffix != "" && suffix != null => s"${baseTriggerName}-${suffix}"
- case _ => s"${baseTriggerName}-${currentTime}"
- }
+ val feedCreationResult = assetHelper.withCleaner(wsk.trigger, triggerName) {
+ (trigger, _) =>
+ trigger.create(triggerName, feed = Some(actionName), parameters = Map(
+ "user" -> kafkaUtils.getAsJson("user"),
+ "password" -> kafkaUtils.getAsJson("password"),
+ "api_key" -> kafkaUtils.getAsJson("api_key"),
+ "kafka_admin_url" -> kafkaUtils.getAsJson("kafka_admin_url"),
+ "kafka_brokers_sasl" -> kafkaUtils.getAsJson("brokers"),
+ "topic" -> topic.toJson
+ ))
+ }
- (wp, assetHelper) =>
- val result = wsk.trigger.get(triggerName, expectedExitCode = DONTCARE_EXIT)
-
- if (result.exitCode == NOT_FOUND) {
- // trigger does not yet exist, create it
- println(s"Creating trigger ${triggerName}")
-
- val feedCreationResult = assetHelper.withCleaner(wsk.trigger, triggerName) {
- (trigger, _) =>
- trigger.create(triggerName, feed = Some(s"$messagingPackage/$messageHubFeed"), parameters = Map(
- "user" -> kafkaUtils.getAsJson("user"),
- "password" -> kafkaUtils.getAsJson("password"),
- "api_key" -> kafkaUtils.getAsJson("api_key"),
- "kafka_admin_url" -> kafkaUtils.getAsJson("kafka_admin_url"),
- "kafka_brokers_sasl" -> kafkaUtils.getAsJson("brokers"),
- "topic" -> topic.toJson
- ))
- }
-
- withActivation(wsk.activation, feedCreationResult, initialWait = 5 seconds, totalWait = 60 seconds) {
- activation =>
- // should be successful
- activation.response.success shouldBe true
- }
-
- // It takes a moment for the consumer to fully initialize.
- println("Giving the consumer a moment to get ready")
- Thread.sleep(consumerInitTime)
- } else {
- result.exitCode shouldBe (SUCCESS_EXIT)
- println(s"Trigger already exists, reusing it: $triggerName")
+ withActivation(wsk.activation, feedCreationResult, initialWait = 5 seconds, totalWait = 60 seconds) {
+ activation =>
+ // should be successful
+ activation.response.success shouldBe true
}
+ // It takes a moment for the consumer to fully initialize.
+ println("Giving the consumer a moment to get ready")
+ Thread.sleep(consumerInitTime)
+
val defaultAction = Some(TestUtils.getTestActionFilename("hello.js"))
- val defaultActionName = s"helloKafka-${currentTime}"
+ val defaultActionName = s"helloKafka-$currentTime"
assetHelper.withCleaner(wsk.action, defaultActionName) { (action, name) =>
action.create(name, defaultAction)
}
- assetHelper.withCleaner(wsk.rule, "rule") { (rule, name) =>
+
+ assetHelper.withCleaner(wsk.rule, s"dummyMessageHub-helloKafka-$currentTime") { (rule, name) =>
rule.create(name, trigger = triggerName, action = defaultActionName)
}
- retry({
- val start = Instant.now(Clock.systemUTC())
- // key to use for the produced message
- val key = "TheKey"
-
- println("Producing a message")
- withActivation(wsk.activation, wsk.action.invoke(s"$messagingPackage/$messageHubProduce", Map(
- "user" -> kafkaUtils.getAsJson("user"),
- "password" -> kafkaUtils.getAsJson("password"),
- "kafka_brokers_sasl" -> kafkaUtils.getAsJson("brokers"),
- "topic" -> topic.toJson,
- "key" -> key.toJson,
- "value" -> currentTime.toJson
- ))) {
- _.response.success shouldBe true
- }
+ // key to use for the produced message
+ val key = "TheKey"
+
+ println("Producing a message")
+ withActivation(wsk.activation, wsk.action.invoke(s"$messagingPackage/$messageHubProduce", Map(
+ "user" -> kafkaUtils.getAsJson("user"),
+ "password" -> kafkaUtils.getAsJson("password"),
+ "kafka_brokers_sasl" -> kafkaUtils.getAsJson("brokers"),
+ "topic" -> topic.toJson,
+ "key" -> key.toJson,
+ "value" -> currentTime.toJson
+ ))) {
+ _.response.success shouldBe true
+ }
+ retry({
println("Polling for activations")
- val activations = wsk.activation.pollFor(N = 100, Some(triggerName), since = Some(start), retries = maxRetries)
- assert(activations.length > 0)
-
- println("Validating content of activation(s)")
- val matchingActivations = for {
- id <- activations
- activation = wsk.activation.waitForActivation(id)
- if (activation.isRight && activation.right.get.fields.get("response").toString.contains(currentTime))
- } yield activation.right.get
-
- assert(matchingActivations.length == 1)
-
- val activation = matchingActivations.head
- activation.getFieldPath("response", "success") shouldBe Some(true.toJson)
-
- // assert that there exists a message in the activation which has the expected keys and values
- val messages = KafkaUtils.messagesInActivation(activation, field = "value", value = currentTime)
- assert(messages.length == 1)
-
- val message = messages.head
- message.getFieldPath("topic") shouldBe Some(topic.toJson)
- message.getFieldPath("key") shouldBe Some(key.toJson)
+ val activations = wsk.activation.pollFor(N = 1, Some(triggerName), retries = maxRetries)
+ assert(activations.nonEmpty)
Review comment:
Can we increase `N` below just for fun?
----------------------------------------------------------------
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:
users@infra.apache.org
With regards,
Apache Git Services