You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openwhisk.apache.org by md...@apache.org on 2018/07/03 20:20:59 UTC
[incubator-openwhisk] 13/19: Remove burried ActorSystem which
turned into several instances for every instantiated instance of the Rest
'wsk'.
This is an automated email from the ASF dual-hosted git repository.
mdeuser pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-openwhisk.git
commit 663440da35baf4b066add3e5fae70cfc0557a1d3
Author: Rodric Rabbah <ro...@gmail.com>
AuthorDate: Fri Jun 8 23:07:06 2018 -0400
Remove burried ActorSystem which turned into several instances for every instantiated instance of the Rest 'wsk'.
---
.../apigw/healthtests/ApiGwEndToEndTests.scala | 2 +-
.../apigw/healthtests/ApiGwRestEndToEndTests.scala | 7 +--
.../common/{CommandLine.scala => RunCliCmd.scala} | 4 +-
.../test/scala/common/rest/WskRestOperations.scala | 53 +++++++++++-----------
tests/src/test/scala/limits/ThrottleTests.scala | 1 +
.../scala/system/basic/WskRestActionTests.scala | 10 ++--
.../system/basic/WskRestActivationTests.scala | 5 +-
.../scala/system/basic/WskRestBasicJavaTests.scala | 6 +--
.../system/basic/WskRestBasicNode6Tests.scala | 5 +-
.../system/basic/WskRestBasicNode8Tests.scala | 5 +-
.../basic/WskRestBasicNodeDefaultTests.scala | 5 +-
.../system/basic/WskRestBasicPythonTests.scala | 5 +-
.../system/basic/WskRestBasicSwift311Tests.scala | 5 +-
.../system/basic/WskRestBasicSwift41Tests.scala | 5 +-
.../scala/system/basic/WskRestBasicTests.scala | 8 ++--
.../scala/system/basic/WskRestConductorTests.scala | 5 +-
.../scala/system/basic/WskRestPackageTests.scala | 8 ++--
.../test/scala/system/basic/WskRestRuleTests.scala | 5 +-
.../system/basic/WskRestUnicodeJavaTests.scala | 5 +-
.../system/basic/WskRestUnicodeNode6Tests.scala | 5 +-
.../system/basic/WskRestUnicodeNode8Tests.scala | 5 +-
.../system/basic/WskRestUnicodePython2Tests.scala | 8 ++--
.../system/basic/WskRestUnicodePython3Tests.scala | 8 ++--
.../system/basic/WskRestUnicodeSwift311Tests.scala | 8 ++--
.../system/basic/WskRestUnicodeSwift41Tests.scala | 6 +--
.../test/scala/system/rest/ActionSchemaTests.scala | 16 +++----
.../scala/whisk/core/admin/WskAdminTests.scala | 4 +-
.../whisk/core/cli/test/ApiGwRestBasicTests.scala | 2 +-
.../scala/whisk/core/cli/test/ApiGwRestTests.scala | 4 +-
.../core/cli/test/WskActionSequenceTests.scala | 2 +-
.../core/cli/test/WskRestActionSequenceTests.scala | 4 +-
.../core/cli/test/WskRestBasicUsageTests.scala | 3 +-
.../core/cli/test/WskRestEntitlementTests.scala | 5 +-
.../core/cli/test/WskRestWebActionsTests.scala | 6 +--
.../whisk/core/cli/test/WskWebActionsTests.scala | 8 ++--
.../core/database/test/CacheConcurrencyTests.scala | 9 +---
.../whisk/core/limits/ActionLimitsTests.scala | 4 +-
.../whisk/core/limits/MaxActionDurationTests.scala | 4 +-
38 files changed, 135 insertions(+), 125 deletions(-)
diff --git a/tests/src/test/scala/apigw/healthtests/ApiGwEndToEndTests.scala b/tests/src/test/scala/apigw/healthtests/ApiGwEndToEndTests.scala
index 59821e7..957909b 100644
--- a/tests/src/test/scala/apigw/healthtests/ApiGwEndToEndTests.scala
+++ b/tests/src/test/scala/apigw/healthtests/ApiGwEndToEndTests.scala
@@ -55,7 +55,7 @@ abstract class ApiGwEndToEndTests
implicit val wskprops: common.WskProps = WskProps()
val wsk: WskOperations
- val namespace: String = wsk.namespace.whois()
+ lazy val namespace: String = wsk.namespace.whois()
val createCode: Int
// Custom CLI properties file
diff --git a/tests/src/test/scala/apigw/healthtests/ApiGwRestEndToEndTests.scala b/tests/src/test/scala/apigw/healthtests/ApiGwRestEndToEndTests.scala
index abb82e0..577a566 100644
--- a/tests/src/test/scala/apigw/healthtests/ApiGwRestEndToEndTests.scala
+++ b/tests/src/test/scala/apigw/healthtests/ApiGwRestEndToEndTests.scala
@@ -29,12 +29,13 @@ import org.scalatest.junit.JUnitRunner
import common.TestUtils._
import common.rest.WskRestOperations
import common.rest.RestResult
+import common.WskActorSystem
@RunWith(classOf[JUnitRunner])
-class ApiGwRestEndToEndTests extends ApiGwEndToEndTests {
+class ApiGwRestEndToEndTests extends ApiGwEndToEndTests with WskActorSystem {
- override lazy val wsk: common.rest.WskRestOperations = new WskRestOperations
- override val createCode: Int = OK.intValue
+ override lazy val wsk = new WskRestOperations
+ override val createCode = OK.intValue
override def verifyAPICreated(rr: RunResult): Unit = {
val apiResultRest = rr.asInstanceOf[RestResult]
diff --git a/tests/src/test/scala/common/CommandLine.scala b/tests/src/test/scala/common/RunCliCmd.scala
similarity index 98%
rename from tests/src/test/scala/common/CommandLine.scala
rename to tests/src/test/scala/common/RunCliCmd.scala
index 55e451d..a13ee9d 100644
--- a/tests/src/test/scala/common/CommandLine.scala
+++ b/tests/src/test/scala/common/RunCliCmd.scala
@@ -26,7 +26,7 @@ import TestUtils._
import scala.collection.mutable
-trait CommandLine extends Matchers {
+trait RunCliCmd extends Matchers {
/**
* The base command to run. This returns a new mutable buffer, intended for building the rest of the command line.
@@ -102,7 +102,7 @@ trait CommandLine extends Matchers {
}
object WskAdmin {
- val wskadmin = new CommandLine {
+ val wskadmin = new RunCliCmd {
override def baseCommand: mutable.Buffer[String] = WskAdmin.baseCommand
}
diff --git a/tests/src/test/scala/common/rest/WskRestOperations.scala b/tests/src/test/scala/common/rest/WskRestOperations.scala
index b3d42c1..f12d477 100644
--- a/tests/src/test/scala/common/rest/WskRestOperations.scala
+++ b/tests/src/test/scala/common/rest/WskRestOperations.scala
@@ -23,7 +23,6 @@ import java.util.Base64
import java.security.cert.X509Certificate
import org.apache.commons.io.FileUtils
-import org.scalatest.FlatSpec
import org.scalatest.Matchers
import org.scalatest.concurrent.ScalaFutures
import org.scalatest.time.Span.convertDurationToSpan
@@ -67,7 +66,6 @@ import common.TestUtils.DONTCARE_EXIT
import common.TestUtils.RunResult
import common.WaitFor
import common.WhiskProperties
-import common.WskActorSystem
import common.WskProps
import whisk.core.entity.ByteSize
import whisk.utils.retry
@@ -145,7 +143,7 @@ object HttpConnection {
}
}
-class WskRestOperations() extends RunWskRestCmd with WskOperations {
+class WskRestOperations(implicit actorSytem: ActorSystem) extends WskOperations {
override implicit val action = new RestActionOperations
override implicit val trigger = new RestTriggerOperations
override implicit val rule = new RestRuleOperations
@@ -155,7 +153,7 @@ class WskRestOperations() extends RunWskRestCmd with WskOperations {
override implicit val api = new RestGatewayOperations
}
-trait RestListOrGetFromCollectionOperations extends RunWskRestCmd with ListOrGetFromCollectionOperations {
+trait RestListOrGetFromCollectionOperations extends ListOrGetFromCollectionOperations with RunRestCmd {
import FullyQualifiedNames.resolve
/**
@@ -208,7 +206,7 @@ trait RestListOrGetFromCollectionOperations extends RunWskRestCmd with ListOrGet
}
}
-trait RestDeleteFromCollectionOperations extends RunWskRestCmd with DeleteFromCollectionOperations {
+trait RestDeleteFromCollectionOperations extends DeleteFromCollectionOperations with RunRestCmd {
/**
* Deletes entity from collection.
@@ -257,9 +255,8 @@ trait RestActivation extends HasActivation {
}
}
-class RestActionOperations
- extends RunWskRestCmd
- with RestListOrGetFromCollectionOperations
+class RestActionOperations(implicit val actorSystem: ActorSystem)
+ extends RestListOrGetFromCollectionOperations
with RestDeleteFromCollectionOperations
with RestActivation
with ActionOperations {
@@ -458,9 +455,8 @@ class RestActionOperations
}
}
-class RestTriggerOperations
- extends RunWskRestCmd
- with RestListOrGetFromCollectionOperations
+class RestTriggerOperations(implicit val actorSystem: ActorSystem)
+ extends RestListOrGetFromCollectionOperations
with RestDeleteFromCollectionOperations
with RestActivation
with TriggerOperations {
@@ -568,9 +564,8 @@ class RestTriggerOperations
}
}
-class RestRuleOperations
- extends RunWskRestCmd
- with RestListOrGetFromCollectionOperations
+class RestRuleOperations(implicit val actorSystem: ActorSystem)
+ extends RestListOrGetFromCollectionOperations
with RestDeleteFromCollectionOperations
with WaitFor
with RuleOperations {
@@ -652,7 +647,11 @@ class RestRuleOperations
}
}
-class RestActivationOperations extends RunWskRestCmd with RestActivation with WaitFor with ActivationOperations {
+class RestActivationOperations(implicit val actorSystem: ActorSystem)
+ extends ActivationOperations
+ with RunRestCmd
+ with RestActivation
+ with WaitFor {
protected val noun = "activations"
@@ -695,7 +694,7 @@ class RestActivationOperations extends RunWskRestCmd with RestActivation with Wa
docs: Boolean = true,
expectedExitCode: Int = SUCCESS_EXIT)(implicit wp: WskProps): RestResult = {
val entityPath = Path(s"${basePath}/namespaces/${wp.namespace}/$noun")
- var paramMap = Map("skip" -> "0", "docs" -> docs.toString) ++ {
+ val paramMap = Map("skip" -> "0", "docs" -> docs.toString) ++ {
limit map { l =>
Map("limit" -> l.toString)
} getOrElse Map.empty
@@ -864,7 +863,7 @@ class RestActivationOperations extends RunWskRestCmd with RestActivation with Wa
private case class PartialResult(ids: Seq[String]) extends Throwable
}
-class RestNamespaceOperations extends RunWskRestCmd with NamespaceOperations {
+class RestNamespaceOperations(implicit val actorSystem: ActorSystem) extends NamespaceOperations with RunRestCmd {
protected val noun = "namespaces"
@@ -895,9 +894,8 @@ class RestNamespaceOperations extends RunWskRestCmd with NamespaceOperations {
}
}
-class RestPackageOperations
- extends RunWskRestCmd
- with RestListOrGetFromCollectionOperations
+class RestPackageOperations(implicit val actorSystem: ActorSystem)
+ extends RestListOrGetFromCollectionOperations
with RestDeleteFromCollectionOperations
with PackageOperations {
@@ -979,7 +977,7 @@ class RestPackageOperations
}
-class RestGatewayOperations extends RunWskRestCmd with GatewayOperations {
+class RestGatewayOperations(implicit val actorSystem: ActorSystem) extends GatewayOperations with RunRestCmd {
protected val noun = "apis"
/**
@@ -1196,10 +1194,8 @@ class RestGatewayOperations extends RunWskRestCmd with GatewayOperations {
}
}
-class RunWskRestCmd() extends FlatSpec with Matchers with ScalaFutures with WskActorSystem {
+trait RunRestCmd extends Matchers with ScalaFutures {
- implicit val config = PatienceConfig(100 seconds, 15 milliseconds)
- implicit val materializer = ActorMaterializer()
val protocol = loadConfigOrThrow[String]("whisk.controller.protocol")
val idleTimeout = 90 seconds
val queueSize = 10
@@ -1207,11 +1203,16 @@ class RunWskRestCmd() extends FlatSpec with Matchers with ScalaFutures with WskA
val basePath = Path("/api/v1")
val systemNamespace = "whisk.system"
- val sslConfig = AkkaSSLConfig().mapSettings {
+ implicit val config = PatienceConfig(100 seconds, 15 milliseconds)
+ implicit val actorSystem: ActorSystem
+ lazy implicit val executionContext = actorSystem.dispatcher
+ lazy implicit val materializer = ActorMaterializer()
+
+ lazy val sslConfig = AkkaSSLConfig().mapSettings {
_.withHostnameVerifierClass(classOf[AcceptAllHostNameVerifier].asInstanceOf[Class[HostnameVerifier]])
}
- val connectionContext = new HttpsConnectionContext(SSL.nonValidatingContext(), Some(sslConfig))
+ lazy val connectionContext = new HttpsConnectionContext(SSL.nonValidatingContext(), Some(sslConfig))
def isStatusCodeExpected(expectedExitCode: Int, statusCode: Int): Boolean = {
if ((expectedExitCode != DONTCARE_EXIT) && (expectedExitCode != ANY_ERROR_EXIT))
diff --git a/tests/src/test/scala/limits/ThrottleTests.scala b/tests/src/test/scala/limits/ThrottleTests.scala
index ae01309..72358f6 100644
--- a/tests/src/test/scala/limits/ThrottleTests.scala
+++ b/tests/src/test/scala/limits/ThrottleTests.scala
@@ -295,6 +295,7 @@ class NamespaceSpecificThrottleTests
extends FlatSpec
with TestHelpers
with WskTestHelpers
+ with WskActorSystem
with Matchers
with BeforeAndAfterAll
with LocalHelper {
diff --git a/tests/src/test/scala/system/basic/WskRestActionTests.scala b/tests/src/test/scala/system/basic/WskRestActionTests.scala
index 1f46628..be41abf 100644
--- a/tests/src/test/scala/system/basic/WskRestActionTests.scala
+++ b/tests/src/test/scala/system/basic/WskRestActionTests.scala
@@ -17,17 +17,15 @@
package system.basic
+import common.{TestUtils, WskActorSystem}
+import common.rest.WskRestOperations
import org.junit.runner.RunWith
import org.scalatest.junit.JUnitRunner
-
-import common.rest.WskRestOperations
-import common.TestUtils
-
import spray.json._
@RunWith(classOf[JUnitRunner])
-class WskRestActionTests extends WskActionTests {
- override val wsk: WskRestOperations = new WskRestOperations
+class WskRestActionTests extends WskActionTests with WskActorSystem {
+ override val wsk = new WskRestOperations
it should "create an action with an empty file" in withAssetCleaner(wskprops) { (wp, assetHelper) =>
val name = "empty"
diff --git a/tests/src/test/scala/system/basic/WskRestActivationTests.scala b/tests/src/test/scala/system/basic/WskRestActivationTests.scala
index c7f7897..86cd831 100644
--- a/tests/src/test/scala/system/basic/WskRestActivationTests.scala
+++ b/tests/src/test/scala/system/basic/WskRestActivationTests.scala
@@ -21,8 +21,9 @@ import org.junit.runner.RunWith
import org.scalatest.junit.JUnitRunner
import common.rest.WskRestOperations
+import common.WskActorSystem
@RunWith(classOf[JUnitRunner])
-class WskRestActivationTests extends WskActivationTests {
- override val wsk: WskRestOperations = new WskRestOperations
+class WskRestActivationTests extends WskActivationTests with WskActorSystem {
+ override val wsk = new WskRestOperations
}
diff --git a/tests/src/test/scala/system/basic/WskRestBasicJavaTests.scala b/tests/src/test/scala/system/basic/WskRestBasicJavaTests.scala
index 5cc5126..4567be2 100644
--- a/tests/src/test/scala/system/basic/WskRestBasicJavaTests.scala
+++ b/tests/src/test/scala/system/basic/WskRestBasicJavaTests.scala
@@ -18,11 +18,11 @@
package system.basic
import common.rest.WskRestOperations
-
+import common.WskActorSystem
import org.junit.runner.RunWith
import org.scalatest.junit.JUnitRunner
@RunWith(classOf[JUnitRunner])
-class WskRestBasicJavaTests extends WskBasicJavaTests {
- override val wsk: common.rest.WskRestOperations = new WskRestOperations
+class WskRestBasicJavaTests extends WskBasicJavaTests with WskActorSystem {
+ override val wsk = new WskRestOperations
}
diff --git a/tests/src/test/scala/system/basic/WskRestBasicNode6Tests.scala b/tests/src/test/scala/system/basic/WskRestBasicNode6Tests.scala
index 792b13d..8eb0cd6 100644
--- a/tests/src/test/scala/system/basic/WskRestBasicNode6Tests.scala
+++ b/tests/src/test/scala/system/basic/WskRestBasicNode6Tests.scala
@@ -18,11 +18,12 @@
package system.basic
import common.rest.WskRestOperations
+import common.WskActorSystem
import org.junit.runner.RunWith
import org.scalatest.junit.JUnitRunner
@RunWith(classOf[JUnitRunner])
-class WskRestBasicNode6Tests extends WskBasicNode6Tests {
- override val wsk: common.rest.WskRestOperations = new WskRestOperations
+class WskRestBasicNode6Tests extends WskBasicNode6Tests with WskActorSystem {
+ override val wsk = new WskRestOperations
}
diff --git a/tests/src/test/scala/system/basic/WskRestBasicNode8Tests.scala b/tests/src/test/scala/system/basic/WskRestBasicNode8Tests.scala
index 3b69b74..ca1ee84 100644
--- a/tests/src/test/scala/system/basic/WskRestBasicNode8Tests.scala
+++ b/tests/src/test/scala/system/basic/WskRestBasicNode8Tests.scala
@@ -18,11 +18,12 @@
package system.basic
import common.rest.WskRestOperations
+import common.WskActorSystem
import org.junit.runner.RunWith
import org.scalatest.junit.JUnitRunner
@RunWith(classOf[JUnitRunner])
-class WskRestBasicNode8Tests extends WskBasicNode8Tests {
- override val wsk: common.rest.WskRestOperations = new WskRestOperations
+class WskRestBasicNode8Tests extends WskBasicNode8Tests with WskActorSystem {
+ override val wsk = new WskRestOperations
}
diff --git a/tests/src/test/scala/system/basic/WskRestBasicNodeDefaultTests.scala b/tests/src/test/scala/system/basic/WskRestBasicNodeDefaultTests.scala
index 367aa9c..ed5b3dd 100644
--- a/tests/src/test/scala/system/basic/WskRestBasicNodeDefaultTests.scala
+++ b/tests/src/test/scala/system/basic/WskRestBasicNodeDefaultTests.scala
@@ -18,11 +18,12 @@
package system.basic
import common.rest.WskRestOperations
+import common.WskActorSystem
import org.junit.runner.RunWith
import org.scalatest.junit.JUnitRunner
@RunWith(classOf[JUnitRunner])
-class WskRestBasicNodeDefaultTests extends WskBasicNodeDefaultTests {
- override val wsk: common.rest.WskRestOperations = new WskRestOperations
+class WskRestBasicNodeDefaultTests extends WskBasicNodeDefaultTests with WskActorSystem {
+ override val wsk = new WskRestOperations
}
diff --git a/tests/src/test/scala/system/basic/WskRestBasicPythonTests.scala b/tests/src/test/scala/system/basic/WskRestBasicPythonTests.scala
index d6242f1..8a65b9c 100644
--- a/tests/src/test/scala/system/basic/WskRestBasicPythonTests.scala
+++ b/tests/src/test/scala/system/basic/WskRestBasicPythonTests.scala
@@ -18,11 +18,12 @@
package system.basic
import common.rest.WskRestOperations
+import common.WskActorSystem
import org.junit.runner.RunWith
import org.scalatest.junit.JUnitRunner
@RunWith(classOf[JUnitRunner])
-class WskRestBasicPythonTests extends WskBasicPythonTests {
- override val wsk: common.rest.WskRestOperations = new WskRestOperations
+class WskRestBasicPythonTests extends WskBasicPythonTests with WskActorSystem {
+ override val wsk = new WskRestOperations
}
diff --git a/tests/src/test/scala/system/basic/WskRestBasicSwift311Tests.scala b/tests/src/test/scala/system/basic/WskRestBasicSwift311Tests.scala
index 46e3935..92161b0 100644
--- a/tests/src/test/scala/system/basic/WskRestBasicSwift311Tests.scala
+++ b/tests/src/test/scala/system/basic/WskRestBasicSwift311Tests.scala
@@ -18,12 +18,13 @@
package system.basic
import common.rest.WskRestOperations
+import common.WskActorSystem
import org.junit.runner.RunWith
import org.scalatest.junit.JUnitRunner
@RunWith(classOf[JUnitRunner])
-class WskRestBasicSwift311Tests extends WskBasicSwift3Tests {
- override val wsk: common.rest.WskRestOperations = new WskRestOperations
+class WskRestBasicSwift311Tests extends WskBasicSwift3Tests with WskActorSystem {
+ override val wsk = new WskRestOperations
override lazy val actionKind = "swift:3.1.1"
}
diff --git a/tests/src/test/scala/system/basic/WskRestBasicSwift41Tests.scala b/tests/src/test/scala/system/basic/WskRestBasicSwift41Tests.scala
index 0222020..c6a7908 100644
--- a/tests/src/test/scala/system/basic/WskRestBasicSwift41Tests.scala
+++ b/tests/src/test/scala/system/basic/WskRestBasicSwift41Tests.scala
@@ -18,13 +18,14 @@
package system.basic
import common.rest.WskRestOperations
+import common.WskActorSystem
import org.junit.runner.RunWith
import org.scalatest.junit.JUnitRunner
@RunWith(classOf[JUnitRunner])
-class WskRestBasicSwift41Tests extends WskBasicSwift3Tests {
- override val wsk: common.rest.WskRestOperations = new WskRestOperations
+class WskRestBasicSwift41Tests extends WskBasicSwift3Tests with WskActorSystem {
+ override val wsk = new WskRestOperations
override lazy val actionKind = "swift:4.1"
}
diff --git a/tests/src/test/scala/system/basic/WskRestBasicTests.scala b/tests/src/test/scala/system/basic/WskRestBasicTests.scala
index 3042205..d8a54d3 100644
--- a/tests/src/test/scala/system/basic/WskRestBasicTests.scala
+++ b/tests/src/test/scala/system/basic/WskRestBasicTests.scala
@@ -36,15 +36,17 @@ import common.rest.WskRestOperations
import common.rest.RestResult
import common.WskProps
import common.WskTestHelpers
+import common.WskActorSystem
+
import spray.json._
import spray.json.DefaultJsonProtocol._
import whisk.http.Messages
@RunWith(classOf[JUnitRunner])
-class WskRestBasicTests extends TestHelpers with WskTestHelpers {
+class WskRestBasicTests extends TestHelpers with WskTestHelpers with WskActorSystem {
- implicit val wskprops: common.WskProps = WskProps()
- val wsk: common.rest.WskRestOperations = new WskRestOperations
+ implicit val wskprops = WskProps()
+ val wsk = new WskRestOperations
val defaultAction: Some[String] = Some(TestUtils.getTestActionFilename("hello.js"))
/**
diff --git a/tests/src/test/scala/system/basic/WskRestConductorTests.scala b/tests/src/test/scala/system/basic/WskRestConductorTests.scala
index 7a0757b..a739bed 100644
--- a/tests/src/test/scala/system/basic/WskRestConductorTests.scala
+++ b/tests/src/test/scala/system/basic/WskRestConductorTests.scala
@@ -21,8 +21,9 @@ import org.junit.runner.RunWith
import org.scalatest.junit.JUnitRunner
import common.rest.WskRestOperations
+import common.WskActorSystem
@RunWith(classOf[JUnitRunner])
-class WskRestConductorTests extends WskConductorTests {
- override val wsk: WskRestOperations = new WskRestOperations
+class WskRestConductorTests extends WskConductorTests with WskActorSystem {
+ override val wsk = new WskRestOperations
}
diff --git a/tests/src/test/scala/system/basic/WskRestPackageTests.scala b/tests/src/test/scala/system/basic/WskRestPackageTests.scala
index 1751f06..d0d6d51 100644
--- a/tests/src/test/scala/system/basic/WskRestPackageTests.scala
+++ b/tests/src/test/scala/system/basic/WskRestPackageTests.scala
@@ -17,11 +17,13 @@
package system.basic
+import common.WskActorSystem
+import common.rest.WskRestOperations
+
import org.junit.runner.RunWith
import org.scalatest.junit.JUnitRunner
-import common.rest.WskRestOperations
@RunWith(classOf[JUnitRunner])
-class WskRestPackageTests extends WskPackageTests {
- override val wsk: WskRestOperations = new WskRestOperations
+class WskRestPackageTests extends WskPackageTests with WskActorSystem {
+ override val wsk = new WskRestOperations
}
diff --git a/tests/src/test/scala/system/basic/WskRestRuleTests.scala b/tests/src/test/scala/system/basic/WskRestRuleTests.scala
index 7ba4ed7..ac00ab4 100644
--- a/tests/src/test/scala/system/basic/WskRestRuleTests.scala
+++ b/tests/src/test/scala/system/basic/WskRestRuleTests.scala
@@ -23,6 +23,7 @@ import org.scalatest.junit.JUnitRunner
import common.TestUtils.RunResult
import common.rest.WskRestOperations
import common.rest.RestResult
+import common.WskActorSystem
import whisk.utils.retry
@@ -32,8 +33,8 @@ import spray.json._
import spray.json.DefaultJsonProtocol._
@RunWith(classOf[JUnitRunner])
-class WskRestRuleTests extends WskRuleTests {
- override val wsk: common.rest.WskRestOperations = new WskRestOperations
+class WskRestRuleTests extends WskRuleTests with WskActorSystem {
+ override val wsk = new WskRestOperations
override def verifyRuleList(ruleListResult: RunResult,
ruleNameEnable: String,
diff --git a/tests/src/test/scala/system/basic/WskRestUnicodeJavaTests.scala b/tests/src/test/scala/system/basic/WskRestUnicodeJavaTests.scala
index 6b27621..bb9ddb7 100644
--- a/tests/src/test/scala/system/basic/WskRestUnicodeJavaTests.scala
+++ b/tests/src/test/scala/system/basic/WskRestUnicodeJavaTests.scala
@@ -23,11 +23,12 @@ import org.scalatest.junit.JUnitRunner
import common.JsHelpers
import common.WskTestHelpers
import common.rest.WskRestOperations
+import common.WskActorSystem
@RunWith(classOf[JUnitRunner])
-class WskRestUnicodeJavaTests extends WskUnicodeTests with WskTestHelpers with JsHelpers {
+class WskRestUnicodeJavaTests extends WskUnicodeTests with WskTestHelpers with WskActorSystem with JsHelpers {
- override val wsk: common.rest.WskRestOperations = new WskRestOperations
+ override val wsk = new WskRestOperations
override lazy val actionKind = "java"
override lazy val actionSource = "unicode.jar"
diff --git a/tests/src/test/scala/system/basic/WskRestUnicodeNode6Tests.scala b/tests/src/test/scala/system/basic/WskRestUnicodeNode6Tests.scala
index 182dcec..c20de9d 100644
--- a/tests/src/test/scala/system/basic/WskRestUnicodeNode6Tests.scala
+++ b/tests/src/test/scala/system/basic/WskRestUnicodeNode6Tests.scala
@@ -23,11 +23,12 @@ import org.scalatest.junit.JUnitRunner
import common.JsHelpers
import common.WskTestHelpers
import common.rest.WskRestOperations
+import common.WskActorSystem
@RunWith(classOf[JUnitRunner])
-class WskRestUnicodeNode6Tests extends WskUnicodeTests with WskTestHelpers with JsHelpers {
+class WskRestUnicodeNode6Tests extends WskUnicodeTests with WskTestHelpers with WskActorSystem with JsHelpers {
- override val wsk: common.rest.WskRestOperations = new WskRestOperations
+ override val wsk = new WskRestOperations
override lazy val actionKind = "nodejs:6"
override lazy val actionSource = "unicode.js"
diff --git a/tests/src/test/scala/system/basic/WskRestUnicodeNode8Tests.scala b/tests/src/test/scala/system/basic/WskRestUnicodeNode8Tests.scala
index 35a7f29..c788757 100644
--- a/tests/src/test/scala/system/basic/WskRestUnicodeNode8Tests.scala
+++ b/tests/src/test/scala/system/basic/WskRestUnicodeNode8Tests.scala
@@ -23,11 +23,12 @@ import org.scalatest.junit.JUnitRunner
import common.JsHelpers
import common.WskTestHelpers
import common.rest.WskRestOperations
+import common.WskActorSystem
@RunWith(classOf[JUnitRunner])
-class WskRestUnicodeNode8Tests extends WskUnicodeTests with WskTestHelpers with JsHelpers {
+class WskRestUnicodeNode8Tests extends WskUnicodeTests with WskTestHelpers with WskActorSystem with JsHelpers {
- override val wsk: common.rest.WskRestOperations = new WskRestOperations
+ override val wsk = new WskRestOperations
override lazy val actionKind = "nodejs:8"
override lazy val actionSource = "unicode.js"
diff --git a/tests/src/test/scala/system/basic/WskRestUnicodePython2Tests.scala b/tests/src/test/scala/system/basic/WskRestUnicodePython2Tests.scala
index a67e151..0d58ca1 100644
--- a/tests/src/test/scala/system/basic/WskRestUnicodePython2Tests.scala
+++ b/tests/src/test/scala/system/basic/WskRestUnicodePython2Tests.scala
@@ -19,15 +19,13 @@ package system.basic
import org.junit.runner.RunWith
import org.scalatest.junit.JUnitRunner
-
-import common.JsHelpers
-import common.WskTestHelpers
+import common.{JsHelpers, WskActorSystem, WskTestHelpers}
import common.rest.WskRestOperations
@RunWith(classOf[JUnitRunner])
-class WskRestUnicodePython2Tests extends WskUnicodeTests with WskTestHelpers with JsHelpers {
+class WskRestUnicodePython2Tests extends WskUnicodeTests with WskTestHelpers with WskActorSystem with JsHelpers {
- override val wsk: common.rest.WskRestOperations = new WskRestOperations
+ override val wsk = new WskRestOperations
override lazy val actionKind = "python:2"
override lazy val actionSource = "unicode2.py"
diff --git a/tests/src/test/scala/system/basic/WskRestUnicodePython3Tests.scala b/tests/src/test/scala/system/basic/WskRestUnicodePython3Tests.scala
index 6d74598..287baff 100644
--- a/tests/src/test/scala/system/basic/WskRestUnicodePython3Tests.scala
+++ b/tests/src/test/scala/system/basic/WskRestUnicodePython3Tests.scala
@@ -19,15 +19,13 @@ package system.basic
import org.junit.runner.RunWith
import org.scalatest.junit.JUnitRunner
-
-import common.JsHelpers
-import common.WskTestHelpers
+import common.{JsHelpers, WskActorSystem, WskTestHelpers}
import common.rest.WskRestOperations
@RunWith(classOf[JUnitRunner])
-class WskRestUnicodePython3Tests extends WskUnicodeTests with WskTestHelpers with JsHelpers {
+class WskRestUnicodePython3Tests extends WskUnicodeTests with WskTestHelpers with WskActorSystem with JsHelpers {
- override val wsk: common.rest.WskRestOperations = new WskRestOperations
+ override val wsk = new WskRestOperations
override lazy val actionKind = "python:3"
override lazy val actionSource = "unicode3.py"
diff --git a/tests/src/test/scala/system/basic/WskRestUnicodeSwift311Tests.scala b/tests/src/test/scala/system/basic/WskRestUnicodeSwift311Tests.scala
index 3b1e5d9..68a7928 100644
--- a/tests/src/test/scala/system/basic/WskRestUnicodeSwift311Tests.scala
+++ b/tests/src/test/scala/system/basic/WskRestUnicodeSwift311Tests.scala
@@ -19,15 +19,13 @@ package system.basic
import org.junit.runner.RunWith
import org.scalatest.junit.JUnitRunner
-
-import common.JsHelpers
-import common.WskTestHelpers
+import common.{JsHelpers, WskActorSystem, WskTestHelpers}
import common.rest.WskRestOperations
@RunWith(classOf[JUnitRunner])
-class WskRestUnicodeSwift311Tests extends WskUnicodeTests with WskTestHelpers with JsHelpers {
+class WskRestUnicodeSwift311Tests extends WskUnicodeTests with WskTestHelpers with WskActorSystem with JsHelpers {
- override val wsk: common.rest.WskRestOperations = new WskRestOperations
+ override val wsk = new WskRestOperations
override lazy val actionKind = "swift:3.1.1"
override lazy val actionSource = "unicode.swift"
diff --git a/tests/src/test/scala/system/basic/WskRestUnicodeSwift41Tests.scala b/tests/src/test/scala/system/basic/WskRestUnicodeSwift41Tests.scala
index cd62237..51577c1 100644
--- a/tests/src/test/scala/system/basic/WskRestUnicodeSwift41Tests.scala
+++ b/tests/src/test/scala/system/basic/WskRestUnicodeSwift41Tests.scala
@@ -17,15 +17,15 @@
package system.basic
-import common.{JsHelpers, WskTestHelpers}
+import common.{JsHelpers, WskActorSystem, WskTestHelpers}
import common.rest.WskRestOperations
import org.junit.runner.RunWith
import org.scalatest.junit.JUnitRunner
@RunWith(classOf[JUnitRunner])
-class WskRestUnicodeSwift41Tests extends WskUnicodeTests with WskTestHelpers with JsHelpers {
+class WskRestUnicodeSwift41Tests extends WskUnicodeTests with WskTestHelpers with WskActorSystem with JsHelpers {
- override val wsk: common.rest.WskRestOperations = new WskRestOperations
+ override val wsk = new WskRestOperations
override lazy val actionKind = "swift:4.1"
override lazy val actionSource = "unicode.swift"
diff --git a/tests/src/test/scala/system/rest/ActionSchemaTests.scala b/tests/src/test/scala/system/rest/ActionSchemaTests.scala
index 7c6356e..a22fccd 100644
--- a/tests/src/test/scala/system/rest/ActionSchemaTests.scala
+++ b/tests/src/test/scala/system/rest/ActionSchemaTests.scala
@@ -19,26 +19,26 @@ package system.rest
import scala.util.Success
import scala.util.Try
-
import org.junit.runner.RunWith
import org.scalatest.FlatSpec
import org.scalatest.Matchers
import org.scalatest.junit.JUnitRunner
-
import com.jayway.restassured.RestAssured
-
-import common.TestUtils
-import common.WhiskProperties
+import common._
import common.rest.WskRestOperations
-import common.WskProps
-import common.WskTestHelpers
import spray.json._
/**
* Basic tests of API calls for actions
*/
@RunWith(classOf[JUnitRunner])
-class ActionSchemaTests extends FlatSpec with Matchers with RestUtil with JsonSchema with WskTestHelpers {
+class ActionSchemaTests
+ extends FlatSpec
+ with Matchers
+ with RestUtil
+ with JsonSchema
+ with WskTestHelpers
+ with WskActorSystem {
implicit val wskprops = WskProps()
val wsk = new WskRestOperations
diff --git a/tests/src/test/scala/whisk/core/admin/WskAdminTests.scala b/tests/src/test/scala/whisk/core/admin/WskAdminTests.scala
index 7251e1a..7342f3e 100644
--- a/tests/src/test/scala/whisk/core/admin/WskAdminTests.scala
+++ b/tests/src/test/scala/whisk/core/admin/WskAdminTests.scala
@@ -18,7 +18,7 @@
package whisk.core.admin
import common.WskAdmin.wskadmin
-import common.{TestHelpers, TestUtils, WskAdmin, WskProps}
+import common._
import common.rest.WskRestOperations
import org.junit.runner.RunWith
import org.scalatest.{BeforeAndAfterAll, Matchers}
@@ -30,7 +30,7 @@ import scala.concurrent.duration.DurationInt
import scala.util.Try
@RunWith(classOf[JUnitRunner])
-class WskAdminTests extends TestHelpers with Matchers with BeforeAndAfterAll {
+class WskAdminTests extends TestHelpers with WskActorSystem with Matchers with BeforeAndAfterAll {
override def beforeAll() = {
val testSpaces = Seq("testspace", "testspace1", "testspace2")
diff --git a/tests/src/test/scala/whisk/core/cli/test/ApiGwRestBasicTests.scala b/tests/src/test/scala/whisk/core/cli/test/ApiGwRestBasicTests.scala
index b520951..f599675 100644
--- a/tests/src/test/scala/whisk/core/cli/test/ApiGwRestBasicTests.scala
+++ b/tests/src/test/scala/whisk/core/cli/test/ApiGwRestBasicTests.scala
@@ -36,7 +36,7 @@ import common.WskProps
@RunWith(classOf[JUnitRunner])
abstract class ApiGwRestBasicTests extends BaseApiGwTests {
- val clinamespace = wsk.namespace.whois()
+ lazy val clinamespace = wsk.namespace.whois()
val createCode: Int
def verifyBadCommands(rr: RunResult, badpath: String): Unit = {
diff --git a/tests/src/test/scala/whisk/core/cli/test/ApiGwRestTests.scala b/tests/src/test/scala/whisk/core/cli/test/ApiGwRestTests.scala
index dcb9104..7a2447c 100644
--- a/tests/src/test/scala/whisk/core/cli/test/ApiGwRestTests.scala
+++ b/tests/src/test/scala/whisk/core/cli/test/ApiGwRestTests.scala
@@ -25,7 +25,7 @@ import spray.json._
import common.rest.WskRestOperations
import common.rest.RestResult
import common.TestUtils.{RunResult, _}
-import common.TestUtils
+import common.{TestUtils, WskActorSystem}
import system.rest.RestUtil
import java.io.File
@@ -33,7 +33,7 @@ import java.io.File
* Tests for testing the CLI "api" subcommand. Most of these tests require a deployed backend.
*/
@RunWith(classOf[JUnitRunner])
-class ApiGwRestTests extends ApiGwRestBasicTests with RestUtil {
+class ApiGwRestTests extends ApiGwRestBasicTests with RestUtil with WskActorSystem {
override lazy val wsk = new WskRestOperations
override lazy val createCode = OK.intValue
diff --git a/tests/src/test/scala/whisk/core/cli/test/WskActionSequenceTests.scala b/tests/src/test/scala/whisk/core/cli/test/WskActionSequenceTests.scala
index 05aff02..5c9705e 100644
--- a/tests/src/test/scala/whisk/core/cli/test/WskActionSequenceTests.scala
+++ b/tests/src/test/scala/whisk/core/cli/test/WskActionSequenceTests.scala
@@ -38,7 +38,7 @@ abstract class WskActionSequenceTests extends TestHelpers with WskTestHelpers {
implicit val wskprops = WskProps()
val wsk: WskOperations
val defaultNamespace = EntityPath.DEFAULT.asString
- val namespace = wsk.namespace.whois()
+ lazy val namespace = wsk.namespace.whois()
behavior of "Wsk Action Sequence"
diff --git a/tests/src/test/scala/whisk/core/cli/test/WskRestActionSequenceTests.scala b/tests/src/test/scala/whisk/core/cli/test/WskRestActionSequenceTests.scala
index 955f9a3..0cc21ed 100644
--- a/tests/src/test/scala/whisk/core/cli/test/WskRestActionSequenceTests.scala
+++ b/tests/src/test/scala/whisk/core/cli/test/WskRestActionSequenceTests.scala
@@ -20,13 +20,13 @@ package whisk.core.cli.test
import org.junit.runner.RunWith
import org.scalatest.junit.JUnitRunner
import spray.json._
-
import common.rest.WskRestOperations
import common.rest.RestResult
import common.TestUtils.RunResult
+import common.WskActorSystem
@RunWith(classOf[JUnitRunner])
-class WskRestActionSequenceTests extends WskActionSequenceTests {
+class WskRestActionSequenceTests extends WskActionSequenceTests with WskActorSystem {
override lazy val wsk = new WskRestOperations
override def verifyActionSequence(action: RunResult, name: String, compValue: JsArray, kindValue: JsString): Unit = {
diff --git a/tests/src/test/scala/whisk/core/cli/test/WskRestBasicUsageTests.scala b/tests/src/test/scala/whisk/core/cli/test/WskRestBasicUsageTests.scala
index c248ae1..03d2035 100644
--- a/tests/src/test/scala/whisk/core/cli/test/WskRestBasicUsageTests.scala
+++ b/tests/src/test/scala/whisk/core/cli/test/WskRestBasicUsageTests.scala
@@ -36,6 +36,7 @@ import common.TestUtils._
import common.WhiskProperties
import common.WskProps
import common.WskTestHelpers
+import common.WskActorSystem
import common.rest.WskRestOperations
import spray.json.DefaultJsonProtocol._
import spray.json._
@@ -48,7 +49,7 @@ import whisk.http.Messages
* Tests for basic CLI usage. Some of these tests require a deployed backend.
*/
@RunWith(classOf[JUnitRunner])
-class WskRestBasicUsageTests extends TestHelpers with WskTestHelpers {
+class WskRestBasicUsageTests extends TestHelpers with WskTestHelpers with WskActorSystem {
implicit val wskprops = WskProps()
val wsk = new WskRestOperations
diff --git a/tests/src/test/scala/whisk/core/cli/test/WskRestEntitlementTests.scala b/tests/src/test/scala/whisk/core/cli/test/WskRestEntitlementTests.scala
index c017e5f..ccbc167 100644
--- a/tests/src/test/scala/whisk/core/cli/test/WskRestEntitlementTests.scala
+++ b/tests/src/test/scala/whisk/core/cli/test/WskRestEntitlementTests.scala
@@ -20,16 +20,15 @@ package whisk.core.cli.test
import akka.http.scaladsl.model.StatusCodes.BadGateway
import akka.http.scaladsl.model.StatusCodes.Forbidden
import akka.http.scaladsl.model.StatusCodes.NotFound
-
import org.junit.runner.RunWith
import org.scalatest.junit.JUnitRunner
-
import common.rest.WskRestOperations
import common.rest.RestResult
import common.TestUtils.RunResult
+import common.WskActorSystem
@RunWith(classOf[JUnitRunner])
-class WskRestEntitlementTests extends WskEntitlementTests {
+class WskRestEntitlementTests extends WskEntitlementTests with WskActorSystem {
override lazy val wsk = new WskRestOperations
override lazy val forbiddenCode = Forbidden.intValue
override lazy val timeoutCode = BadGateway.intValue
diff --git a/tests/src/test/scala/whisk/core/cli/test/WskRestWebActionsTests.scala b/tests/src/test/scala/whisk/core/cli/test/WskRestWebActionsTests.scala
index 517258e..52c7583 100644
--- a/tests/src/test/scala/whisk/core/cli/test/WskRestWebActionsTests.scala
+++ b/tests/src/test/scala/whisk/core/cli/test/WskRestWebActionsTests.scala
@@ -17,12 +17,12 @@
package whisk.core.cli.test
+import common.WskActorSystem
import org.junit.runner.RunWith
import org.scalatest.junit.JUnitRunner
-
import common.rest.WskRestOperations
@RunWith(classOf[JUnitRunner])
-class WskRestWebActionsTests extends WskWebActionsTests {
- override lazy val wsk: common.rest.WskRestOperations = new WskRestOperations
+class WskRestWebActionsTests extends WskWebActionsTests with WskActorSystem {
+ override lazy val wsk = new WskRestOperations
}
diff --git a/tests/src/test/scala/whisk/core/cli/test/WskWebActionsTests.scala b/tests/src/test/scala/whisk/core/cli/test/WskWebActionsTests.scala
index a3b4f08..6abf672 100644
--- a/tests/src/test/scala/whisk/core/cli/test/WskWebActionsTests.scala
+++ b/tests/src/test/scala/whisk/core/cli/test/WskWebActionsTests.scala
@@ -48,9 +48,9 @@ import whisk.core.entity.Subject
abstract class WskWebActionsTests extends TestHelpers with WskTestHelpers with RestUtil with BeforeAndAfterAll {
val MAX_URL_LENGTH = 8192 // 8K matching nginx default
- val wsk: WskOperations
private implicit val wskprops = WskProps()
- val namespace = wsk.namespace.whois()
+ val wsk: WskOperations
+ lazy val namespace = wsk.namespace.whois()
protected val testRoutePath: String = "/api/v1/web"
@@ -313,7 +313,7 @@ abstract class WskWebActionsTests extends TestHelpers with WskTestHelpers with R
private val subdomainRegex = Seq.fill(WhiskProperties.getPartsInVanitySubdomain)("[a-zA-Z0-9]+").mkString("-")
- private val (vanitySubdomain, vanityNamespace, makeTestSubject) = {
+ private lazy val (vanitySubdomain, vanityNamespace, makeTestSubject) = {
if (namespace.matches(subdomainRegex)) {
(namespace, namespace, false)
} else {
@@ -322,7 +322,7 @@ abstract class WskWebActionsTests extends TestHelpers with WskTestHelpers with R
}
}
- private val wskPropsForSubdomainTest = if (makeTestSubject) {
+ private lazy val wskPropsForSubdomainTest = if (makeTestSubject) {
getAdditionalTestSubject(vanityNamespace) // create new subject for the test
} else {
WskProps()
diff --git a/tests/src/test/scala/whisk/core/database/test/CacheConcurrencyTests.scala b/tests/src/test/scala/whisk/core/database/test/CacheConcurrencyTests.scala
index eadac08..ec5a3e6 100644
--- a/tests/src/test/scala/whisk/core/database/test/CacheConcurrencyTests.scala
+++ b/tests/src/test/scala/whisk/core/database/test/CacheConcurrencyTests.scala
@@ -20,25 +20,20 @@ package whisk.core.database.test
import scala.collection.parallel._
import scala.concurrent.duration.DurationInt
import scala.concurrent.forkjoin.ForkJoinPool
-
import org.junit.runner.RunWith
import org.scalatest.BeforeAndAfterEach
import org.scalatest.FlatSpec
import org.scalatest.junit.JUnitRunner
-
import akka.http.scaladsl.model.StatusCodes.NotFound
import common.TestUtils._
-import common.TestUtils
-import common.WhiskProperties
-import common.WskProps
-import common.WskTestHelpers
+import common._
import common.rest.WskRestOperations
import spray.json.JsString
import whisk.common.TransactionId
import whisk.utils.retry
@RunWith(classOf[JUnitRunner])
-class CacheConcurrencyTests extends FlatSpec with WskTestHelpers with BeforeAndAfterEach {
+class CacheConcurrencyTests extends FlatSpec with WskTestHelpers with WskActorSystem with BeforeAndAfterEach {
println(s"Running tests on # proc: ${Runtime.getRuntime.availableProcessors()}")
diff --git a/tests/src/test/scala/whisk/core/limits/ActionLimitsTests.scala b/tests/src/test/scala/whisk/core/limits/ActionLimitsTests.scala
index 5962fdc..9580d2d 100644
--- a/tests/src/test/scala/whisk/core/limits/ActionLimitsTests.scala
+++ b/tests/src/test/scala/whisk/core/limits/ActionLimitsTests.scala
@@ -35,6 +35,8 @@ import common.WhiskProperties
import common.rest.WskRestOperations
import common.WskProps
import common.WskTestHelpers
+import common.WskActorSystem
+
import spray.json._
import spray.json.DefaultJsonProtocol._
import whisk.core.entity.{ActivationEntityLimit, ActivationResponse, ByteSize, Exec, LogLimit, MemoryLimit, TimeLimit}
@@ -42,7 +44,7 @@ import whisk.core.entity.size._
import whisk.http.Messages
@RunWith(classOf[JUnitRunner])
-class ActionLimitsTests extends TestHelpers with WskTestHelpers {
+class ActionLimitsTests extends TestHelpers with WskTestHelpers with WskActorSystem {
implicit val wskprops = WskProps()
val wsk = new WskRestOperations
diff --git a/tests/src/test/scala/whisk/core/limits/MaxActionDurationTests.scala b/tests/src/test/scala/whisk/core/limits/MaxActionDurationTests.scala
index 95a0cbd..1a854f1 100644
--- a/tests/src/test/scala/whisk/core/limits/MaxActionDurationTests.scala
+++ b/tests/src/test/scala/whisk/core/limits/MaxActionDurationTests.scala
@@ -27,6 +27,8 @@ import common.TestUtils
import common.rest.WskRestOperations
import common.WskProps
import common.WskTestHelpers
+import common.WskActorSystem
+
import whisk.core.entity._
import spray.json.DefaultJsonProtocol._
import spray.json._
@@ -38,7 +40,7 @@ import org.scalatest.tagobjects.Slow
* Tests for action duration limits. These tests require a deployed backend.
*/
@RunWith(classOf[JUnitRunner])
-class MaxActionDurationTests extends TestHelpers with WskTestHelpers {
+class MaxActionDurationTests extends TestHelpers with WskTestHelpers with WskActorSystem {
implicit val wskprops = WskProps()
val wsk = new WskRestOperations