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 6f358fecd24ddd7099d91f49fe6b537c24ba3fa4 Author: Rodric Rabbah <[email protected]> AuthorDate: Fri Jun 8 16:28:43 2018 -0400 Remove RunWskAdminCmd trait. --- tests/src/test/scala/common/Wsk.scala | 13 +++++------ tests/src/test/scala/common/WskTestHelpers.scala | 4 ++-- tests/src/test/scala/limits/ThrottleTests.scala | 10 ++------ .../scala/whisk/core/admin/WskAdminTests.scala | 27 ++++++---------------- 4 files changed, 17 insertions(+), 37 deletions(-) diff --git a/tests/src/test/scala/common/Wsk.scala b/tests/src/test/scala/common/Wsk.scala index 4d1f3ce..1d40ba3 100644 --- a/tests/src/test/scala/common/Wsk.scala +++ b/tests/src/test/scala/common/Wsk.scala @@ -23,11 +23,11 @@ import scala.collection.JavaConversions.mapAsJavaMap import scala.collection.mutable.Buffer import scala.language.postfixOps import scala.util.Try - import org.scalatest.Matchers - import TestUtils._ +import scala.collection.mutable + trait HasActivation { /** @@ -160,6 +160,10 @@ trait RunWskCmd extends Matchers { } object WskAdmin { + val wskadmin = new RunWskCmd { + override def baseCommand: mutable.Buffer[String] = WskAdmin.baseCommand + } + private val binDir = WhiskProperties.getFileRelativeToWhiskHome("bin") private val binaryName = "wskadmin" @@ -175,7 +179,6 @@ object WskAdmin { } def listKeys(namespace: String, pick: Integer = 1): List[(String, String)] = { - val wskadmin = new RunWskAdminCmd {} wskadmin .cli(Seq("user", "list", namespace, "--pick", pick.toString)) .stdout @@ -185,7 +188,3 @@ object WskAdmin { .toList } } - -trait RunWskAdminCmd extends RunWskCmd { - override def baseCommand = WskAdmin.baseCommand -} diff --git a/tests/src/test/scala/common/WskTestHelpers.scala b/tests/src/test/scala/common/WskTestHelpers.scala index 3afa610..e889a22 100644 --- a/tests/src/test/scala/common/WskTestHelpers.scala +++ b/tests/src/test/scala/common/WskTestHelpers.scala @@ -277,12 +277,12 @@ trait WskTestHelpers extends Matchers { } def getAdditionalTestSubject(newUser: String): WskProps = { - val wskadmin = new RunWskAdminCmd {} + import WskAdmin.wskadmin WskProps(namespace = newUser, authKey = wskadmin.cli(Seq("user", "create", newUser)).stdout.trim) } def disposeAdditionalTestSubject(subject: String, expectedExitCode: Int = SUCCESS_EXIT): Unit = { - val wskadmin = new RunWskAdminCmd {} + import WskAdmin.wskadmin withClue(s"failed to delete temporary subject $subject") { wskadmin.cli(Seq("user", "delete", subject), expectedExitCode).stdout should include("Subject deleted") } diff --git a/tests/src/test/scala/limits/ThrottleTests.scala b/tests/src/test/scala/limits/ThrottleTests.scala index f132995..bc5da1e 100644 --- a/tests/src/test/scala/limits/ThrottleTests.scala +++ b/tests/src/test/scala/limits/ThrottleTests.scala @@ -31,15 +31,10 @@ import org.scalatest.FlatSpec import org.scalatest.Matchers import org.scalatest.concurrent.ScalaFutures import org.scalatest.junit.JUnitRunner -import common.RunWskAdminCmd -import common.TestHelpers -import common.TestUtils +import common._ import common.TestUtils._ -import common.WhiskProperties import common.rest.WskRest -import common.WskActorSystem -import common.WskProps -import common.WskTestHelpers +import WskAdmin.wskadmin import spray.json._ import spray.json.DefaultJsonProtocol._ import whisk.http.Messages._ @@ -306,7 +301,6 @@ class NamespaceSpecificThrottleTests val defaultAction = Some(TestUtils.getTestActionFilename("hello.js")) - val wskadmin = new RunWskAdminCmd {} val wsk = new WskRest def sanitizeNamespaces(namespaces: Seq[String], expectedExitCode: Int = SUCCESS_EXIT): Unit = { diff --git a/tests/src/test/scala/whisk/core/admin/WskAdminTests.scala b/tests/src/test/scala/whisk/core/admin/WskAdminTests.scala index c76dff9..e5bcff3 100644 --- a/tests/src/test/scala/whisk/core/admin/WskAdminTests.scala +++ b/tests/src/test/scala/whisk/core/admin/WskAdminTests.scala @@ -17,28 +17,22 @@ package whisk.core.admin -import scala.concurrent.duration.DurationInt - +import common.WskAdmin.wskadmin +import common.{TestHelpers, TestUtils, WskAdmin, WskProps} +import common.rest.WskRest import org.junit.runner.RunWith -import org.scalatest.Matchers +import org.scalatest.{BeforeAndAfterAll, Matchers} import org.scalatest.junit.JUnitRunner -import org.scalatest.BeforeAndAfterAll - -import common.RunWskAdminCmd +import whisk.core.entity.{BasicAuthenticationAuthKey, Subject} import common.TestHelpers -import common.rest.WskRest -import common.WskAdmin -import common.WskProps -import whisk.core.entity.BasicAuthenticationAuthKey -import whisk.core.entity.Subject -import common.TestUtils + +import scala.concurrent.duration.DurationInt import scala.util.Try @RunWith(classOf[JUnitRunner]) class WskAdminTests extends TestHelpers with Matchers with BeforeAndAfterAll { override def beforeAll() = { - val wskadmin = new RunWskAdminCmd {} val testSpaces = Seq("testspace", "testspace1", "testspace2") testSpaces.foreach(testspace => { Try { @@ -60,7 +54,6 @@ class WskAdminTests extends TestHelpers with Matchers with BeforeAndAfterAll { } it should "CRD a subject" in { - val wskadmin = new RunWskAdminCmd {} val auth = BasicAuthenticationAuthKey() val subject = Subject().asString try { @@ -103,7 +96,6 @@ class WskAdminTests extends TestHelpers with Matchers with BeforeAndAfterAll { } it should "list all namespaces for a subject" in { - val wskadmin = new RunWskAdminCmd {} val auth = BasicAuthenticationAuthKey() val subject = Subject().asString try { @@ -122,7 +114,6 @@ class WskAdminTests extends TestHelpers with Matchers with BeforeAndAfterAll { } it should "verify guest account installed correctly" in { - val wskadmin = new RunWskAdminCmd {} implicit val wskprops = WskProps() val wsk = new WskRest val ns = wsk.namespace.whois() @@ -130,7 +121,6 @@ class WskAdminTests extends TestHelpers with Matchers with BeforeAndAfterAll { } it should "block and unblock a user respectively" in { - val wskadmin = new RunWskAdminCmd {} val auth = BasicAuthenticationAuthKey() val subject1 = Subject().asString val subject2 = Subject().asString @@ -170,7 +160,6 @@ class WskAdminTests extends TestHelpers with Matchers with BeforeAndAfterAll { } it should "block and unblock should accept more than a single subject" in { - val wskadmin = new RunWskAdminCmd {} val subject1 = Subject().asString val subject2 = Subject().asString try { @@ -196,7 +185,6 @@ class WskAdminTests extends TestHelpers with Matchers with BeforeAndAfterAll { } it should "not allow edits on a blocked subject" in { - val wskadmin = new RunWskAdminCmd {} val subject = Subject().asString try { // initially create the subject @@ -217,7 +205,6 @@ class WskAdminTests extends TestHelpers with Matchers with BeforeAndAfterAll { } it should "adjust throttles for namespace" in { - val wskadmin = new RunWskAdminCmd {} val subject = Subject().asString try { // set some limits
