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-package-cloudant.git
The following commit(s) were added to refs/heads/master by this push: new 318b407 add delay in feed tests (between trigger creation and doc creation) (#186) 318b407 is described below commit 318b4077cfe7cd5bbced3abee6523256f8afccf5 Author: Jason Peterson <jason...@us.ibm.com> AuthorDate: Thu Nov 29 09:34:26 2018 -0500 add delay in feed tests (between trigger creation and doc creation) (#186) --- .../system/health/CloudantHealthFeedTests.scala | 6 +++--- .../scala/system/packages/CloudantFeedTests.scala | 21 +++++++++++++++------ 2 files changed, 18 insertions(+), 9 deletions(-) diff --git a/tests/src/test/scala/system/health/CloudantHealthFeedTests.scala b/tests/src/test/scala/system/health/CloudantHealthFeedTests.scala index a0302bf..545178e 100644 --- a/tests/src/test/scala/system/health/CloudantHealthFeedTests.scala +++ b/tests/src/test/scala/system/health/CloudantHealthFeedTests.scala @@ -42,7 +42,7 @@ class CloudantHealthFeedTests val wsk = new Wsk val defaultAction = Some(TestUtils.getTestActionFilename("hello.js")) val myCloudantCreds = CloudantUtil.Credential.makeFromVCAPFile("cloudantNoSQLDB", this.getClass.getSimpleName) - val maxRetries = System.getProperty("max.retries", "60").toInt + val maxRetries = System.getProperty("max.retries", "30").toInt behavior of "Cloudant Health trigger service" @@ -98,7 +98,7 @@ class CloudantHealthFeedTests (rule, name) => rule.create(name, trigger = triggerName, action = actionName) } - val activationsBeforeChange = wsk.activation.pollFor(N = 1, Some(triggerName)).length + val activationsBeforeChange = wsk.activation.pollFor(N = 1, Some(triggerName), retries = maxRetries).length activationsBeforeChange should be(0) // create a test doc in the sample db @@ -167,7 +167,7 @@ class CloudantHealthFeedTests (rule, name) => rule.create(name, trigger = triggerName, action = actionName) } - val activationsBeforeDelete = wsk.activation.pollFor(N = 1, Some(triggerName)).length + val activationsBeforeDelete = wsk.activation.pollFor(N = 1, Some(triggerName), retries = maxRetries).length activationsBeforeDelete should be(0) // delete a test doc in the sample db and verify trigger is fired diff --git a/tests/src/test/scala/system/packages/CloudantFeedTests.scala b/tests/src/test/scala/system/packages/CloudantFeedTests.scala index 49e14dd..5b433d5 100644 --- a/tests/src/test/scala/system/packages/CloudantFeedTests.scala +++ b/tests/src/test/scala/system/packages/CloudantFeedTests.scala @@ -40,7 +40,7 @@ class CloudantFeedTests val wsk = new Wsk val myCloudantCreds = CloudantUtil.Credential.makeFromVCAPFile("cloudantNoSQLDB", this.getClass.getSimpleName) val defaultAction = Some(TestUtils.getTestActionFilename("hello.js")) - val maxRetries = System.getProperty("max.retries", "60").toInt + val maxRetries = System.getProperty("max.retries", "30").toInt behavior of "Cloudant trigger service" @@ -243,6 +243,9 @@ class CloudantFeedTests rule.create(name, trigger = triggerName, action = actionName) } + val activationsBeforeCreate = wsk.activation.pollFor(N = 1, Some(triggerName), retries = maxRetries).length + activationsBeforeCreate should be(0) + // Create test docs in cloudant and assert that document was inserted successfully println("Creating a test doc-1 in the cloudant") val response1 = CloudantUtil.createDocument(myCloudantCreds, "{\"test\":\"test_doc_1\"}") @@ -315,13 +318,16 @@ class CloudantFeedTests rule.create(name, trigger = triggerName, action = actionName) } + val activationsBeforeCreate = wsk.activation.pollFor(N = 1, Some(triggerName), retries = maxRetries).length + activationsBeforeCreate should be(0) + // Create test docs in cloudant and assert that document was inserted successfully println("Creating a test doc-1 in the cloudant") val response1 = CloudantUtil.createDocument(myCloudantCreds, "{\"kind\":\"fruit\", \"type\":\"apple\"}") response1.get("ok").getAsString should be("true") println("Checking for activations") - val activations = wsk.activation.pollFor(N = 1, Some(triggerName), retries = 30).length + val activations = wsk.activation.pollFor(N = 1, Some(triggerName), retries = maxRetries).length println(s"Found activation size (should be exactly 1): $activations") activations should be(1) @@ -339,7 +345,7 @@ class CloudantFeedTests response3.get("ok").getAsString should be("true") println("Checking for new activations (should now have 2)") - val newActivations = wsk.activation.pollFor(N = 3, Some(triggerName), retries = 30).length + val newActivations = wsk.activation.pollFor(N = 3, Some(triggerName), retries = maxRetries).length println(s"Found activation size (should be 2): $newActivations") newActivations should be(2) @@ -575,13 +581,16 @@ class CloudantFeedTests rule.create(name, trigger = triggerName, action = actionName) } + val activationsBeforeCreate = wsk.activation.pollFor(N = 1, Some(triggerName), retries = maxRetries).length + activationsBeforeCreate should be(0) + // Create test docs in cloudant and assert that document was inserted successfully println("Creating a test doc-1 in the cloudant") val response1 = CloudantUtil.createDocument(myCloudantCreds, "{\"kind\":\"fruit\", \"type\":\"apple\"}") response1.get("ok").getAsString should be("true") println("Checking for activations") - val activations = wsk.activation.pollFor(N = 1, Some(triggerName), retries = 30).length + val activations = wsk.activation.pollFor(N = 1, Some(triggerName), retries = maxRetries).length println(s"Found activation size (should be exactly 1): $activations") activations should be(1) @@ -608,7 +617,7 @@ class CloudantFeedTests } println("Giving the trigger service a moment to process the update") - Thread.sleep(10000) + Thread.sleep(maxRetries * 1000) val runResult = wsk.action.invoke(s"$packageName/$feed", parameters = Map( "triggerName" -> triggerName.toJson, @@ -634,7 +643,7 @@ class CloudantFeedTests response3.get("ok").getAsString should be("true") println("Checking for new activations (should now have 2)") - val newActivations = wsk.activation.pollFor(N = 3, Some(triggerName), retries = 30).length + val newActivations = wsk.activation.pollFor(N = 3, Some(triggerName), retries = maxRetries).length println(s"Found activation size (should be 2): $newActivations") newActivations should be(2)