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/14 21:26:49 UTC
[GitHub] tysonnorris closed pull request #3289: add @RunWith annotation for splunk logstore tests
tysonnorris closed pull request #3289: add @RunWith annotation for splunk logstore tests
URL: https://github.com/apache/incubator-openwhisk/pull/3289
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
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 b87e42322e..5fa2266a16 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 08faa479f0..7c027bac8d 100644
--- a/tests/src/test/scala/whisk/core/containerpool/logging/SplunkLogStoreTests.scala
+++ b/tests/src/test/scala/whisk/core/containerpool/logging/SplunkLogStoreTests.scala
@@ -33,12 +33,14 @@ 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 scala.util.Failure
import whisk.core.entity.ActivationLogs
import org.scalatest.FlatSpecLike
+import org.scalatest.junit.JUnitRunner
import pureconfig.error.ConfigReaderException
import scala.concurrent.Await
import scala.concurrent.Promise
@@ -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
----------------------------------------------------------------
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