This is an automated email from the ASF dual-hosted git repository.
markusthoemmes 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 2ca01de Add activation logs integration test. (#3537)
2ca01de is described below
commit 2ca01de39972c69c2f201b93bae3b6be745d2eb8
Author: James Dubee <jwdu...@us.ibm.com>
AuthorDate: Fri Apr 13 02:21:02 2018 -0400
Add activation logs integration test. (#3537)
---
.../scala/system/basic/WskActivationTests.scala | 57 ++++++++++++++++++++++
.../system/basic/WskRestActivationTests.scala | 28 +++++++++++
2 files changed, 85 insertions(+)
diff --git a/tests/src/test/scala/system/basic/WskActivationTests.scala
b/tests/src/test/scala/system/basic/WskActivationTests.scala
new file mode 100644
index 0000000..06ce382
--- /dev/null
+++ b/tests/src/test/scala/system/basic/WskActivationTests.scala
@@ -0,0 +1,57 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package system.basic
+
+import org.junit.runner.RunWith
+import org.scalatest.junit.JUnitRunner
+
+import common.{BaseWsk, JsHelpers, TestHelpers, TestUtils, WskProps,
WskTestHelpers}
+
+import whisk.utils.retry
+
+import scala.concurrent.duration._
+
+@RunWith(classOf[JUnitRunner])
+abstract class WskActivationTests extends TestHelpers with WskTestHelpers with
JsHelpers {
+ implicit val wskprops = WskProps()
+
+ val wsk: BaseWsk
+
+ behavior of "Whisk activations"
+
+ it should "fetch logs using activation logs API" in
withAssetCleaner(wskprops) { (wp, assetHelper) =>
+ val name = "logFetch"
+ val logFormat = "\\d+-\\d+-\\d+T\\d+:\\d+:\\d+.\\d+Z\\s+%s: %s"
+
+ assetHelper.withCleaner(wsk.action, name) { (action, _) =>
+ action.create(name, Some(TestUtils.getTestActionFilename("log.js")))
+ }
+
+ val run = wsk.action.invoke(name, blocking = true)
+
+ // Use withActivation() to reduce intermittent failures that may result
from eventually consistent DBs
+ withActivation(wsk.activation, run) { activation =>
+ retry({
+ val logs = wsk.activation.logs(Some(activation.activationId)).stdout
+
+ logs should include regex (logFormat.format("stdout", "this is
stdout"))
+ logs should include regex (logFormat.format("stderr", "this is
stderr"))
+ }, 10, Some(1.second))
+ }
+ }
+}
diff --git a/tests/src/test/scala/system/basic/WskRestActivationTests.scala
b/tests/src/test/scala/system/basic/WskRestActivationTests.scala
new file mode 100644
index 0000000..5044938
--- /dev/null
+++ b/tests/src/test/scala/system/basic/WskRestActivationTests.scala
@@ -0,0 +1,28 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package system.basic
+
+import org.junit.runner.RunWith
+import org.scalatest.junit.JUnitRunner
+
+import common.rest.WskRest
+
+@RunWith(classOf[JUnitRunner])
+class WskRestActivationTests extends WskActivationTests {
+ override val wsk: WskRest = new WskRest
+}
--
To stop receiving notification emails like this one, please contact
markusthoem...@apache.org.
