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 9ea2da7 Actually run container pool logging tests. (#3288)
9ea2da7 is described below
commit 9ea2da750c0fe45c5dae0176e730ee4d3a740c26
Author: James Dubee <[email protected]>
AuthorDate: Thu Feb 15 09:38:29 2018 -0500
Actually run container pool logging tests. (#3288)
These test-cases were missing the `RunWith` annotation.
---
.../whisk/core/containerpool/logging/LogDriverLogStoreTests.scala | 3 +++
.../scala/whisk/core/containerpool/logging/SplunkLogStoreTests.scala | 3 +++
.../logging/test/DockerToActivationFileLogStoreTests.scala | 3 +++
.../containerpool/logging/test/DockerToActivationLogStoreTests.scala | 3 +++
4 files changed, 12 insertions(+)
diff --git
a/tests/src/test/scala/whisk/core/containerpool/logging/LogDriverLogStoreTests.scala
b/tests/src/test/scala/whisk/core/containerpool/logging/LogDriverLogStoreTests.scala
index b87e423..5fa2266 100644
---
a/tests/src/test/scala/whisk/core/containerpool/logging/LogDriverLogStoreTests.scala
+++
b/tests/src/test/scala/whisk/core/containerpool/logging/LogDriverLogStoreTests.scala
@@ -19,10 +19,13 @@ package whisk.core.containerpool.logging
import akka.actor.ActorSystem
import akka.testkit.TestKit
+import org.junit.runner.RunWith
import org.scalatest.FlatSpecLike
import org.scalatest.Matchers
+import org.scalatest.junit.JUnitRunner
import whisk.core.containerpool.ContainerArgsConfig
+@RunWith(classOf[JUnitRunner])
class LogDriverLogStoreTests extends TestKit(ActorSystem("LogDriverLogStore"))
with FlatSpecLike with Matchers {
val testConfig = ContainerArgsConfig(
diff --git
a/tests/src/test/scala/whisk/core/containerpool/logging/SplunkLogStoreTests.scala
b/tests/src/test/scala/whisk/core/containerpool/logging/SplunkLogStoreTests.scala
index 08faa47..f25a49c 100644
---
a/tests/src/test/scala/whisk/core/containerpool/logging/SplunkLogStoreTests.scala
+++
b/tests/src/test/scala/whisk/core/containerpool/logging/SplunkLogStoreTests.scala
@@ -33,9 +33,11 @@ import akka.stream.scaladsl.Flow
import akka.testkit.TestKit
import common.StreamLogging
import java.time.ZonedDateTime
+import org.junit.runner.RunWith
import org.scalatest.Matchers
import org.scalatest.concurrent.PatienceConfiguration.Timeout
import org.scalatest.concurrent.ScalaFutures
+import org.scalatest.junit.JUnitRunner
import scala.util.Failure
import whisk.core.entity.ActivationLogs
import org.scalatest.FlatSpecLike
@@ -61,6 +63,7 @@ import whisk.core.entity.TimeLimit
import whisk.core.entity.WhiskActivation
import whisk.core.entity.size._
+@RunWith(classOf[JUnitRunner])
class SplunkLogStoreTests
extends TestKit(ActorSystem("SplunkLogStore"))
with FlatSpecLike
diff --git
a/tests/src/test/scala/whisk/core/containerpool/logging/test/DockerToActivationFileLogStoreTests.scala
b/tests/src/test/scala/whisk/core/containerpool/logging/test/DockerToActivationFileLogStoreTests.scala
index f142c1b..6f80a92 100644
---
a/tests/src/test/scala/whisk/core/containerpool/logging/test/DockerToActivationFileLogStoreTests.scala
+++
b/tests/src/test/scala/whisk/core/containerpool/logging/test/DockerToActivationFileLogStoreTests.scala
@@ -23,7 +23,9 @@ import akka.stream.scaladsl.{Flow, Sink, Source}
import akka.testkit.TestProbe
import akka.util.ByteString
import common.{StreamLogging, WskActorSystem}
+import org.junit.runner.RunWith
import org.scalatest.Matchers
+import org.scalatest.junit.JUnitRunner
import spray.json._
import spray.json.DefaultJsonProtocol._
import whisk.common.TransactionId
@@ -34,6 +36,7 @@ import whisk.core.entity._
* Includes the tests for the DockerToActivationLogStore since the behavior
towards the activation storage should
* remain exactly the same.
*/
+@RunWith(classOf[JUnitRunner])
class DockerToActivationFileLogStoreTests
extends DockerToActivationLogStoreTests
with Matchers
diff --git
a/tests/src/test/scala/whisk/core/containerpool/logging/test/DockerToActivationLogStoreTests.scala
b/tests/src/test/scala/whisk/core/containerpool/logging/test/DockerToActivationLogStoreTests.scala
index 170f9cc..dc46bff 100644
---
a/tests/src/test/scala/whisk/core/containerpool/logging/test/DockerToActivationLogStoreTests.scala
+++
b/tests/src/test/scala/whisk/core/containerpool/logging/test/DockerToActivationLogStoreTests.scala
@@ -18,7 +18,9 @@
package whisk.core.containerpool.logging.test
import common.{StreamLogging, WskActorSystem}
+import org.junit.runner.RunWith
import org.scalatest.{FlatSpec, Matchers}
+import org.scalatest.junit.JUnitRunner
import whisk.core.containerpool.logging.{DockerToActivationLogStoreProvider,
LogCollectingException, LogLine}
import whisk.core.entity.ExecManifest.{ImageName, RuntimeManifest}
import whisk.core.entity._
@@ -34,6 +36,7 @@ import whisk.http.Messages
import scala.concurrent.{Await, ExecutionContext, Future}
import scala.concurrent.duration._
+@RunWith(classOf[JUnitRunner])
class DockerToActivationLogStoreTests extends FlatSpec with Matchers with
WskActorSystem with StreamLogging {
def await[T](future: Future[T]) = Await.result(future, 1.minute)
--
To stop receiving notification emails like this one, please contact
[email protected].
