[incubator-openwhisk-cli] 04/07: Delete test assets. (#2826)

[cs...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

csantanapr pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-openwhisk-cli.git

commit 62c6d662139075f17a685629ef2cff99b41a033e
Author: rodric rabbah <ro...@gmail.com>
AuthorDate: Tue Oct 3 21:17:33 2017 -0400

    Delete test assets. (#2826)
---
 .../scala/whisk/core/cli/test/WskEntitlementTests.scala  | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/tests/src/test/scala/whisk/core/cli/test/WskEntitlementTests.scala b/tests/src/test/scala/whisk/core/cli/test/WskEntitlementTests.scala
index 27310aa..9a96e4d 100644
--- a/tests/src/test/scala/whisk/core/cli/test/WskEntitlementTests.scala
+++ b/tests/src/test/scala/whisk/core/cli/test/WskEntitlementTests.scala
@@ -70,6 +70,7 @@ class WskEntitlementTests extends TestHelpers with WskTestHelpers with BeforeAnd
           rr.stderr should include("not authorized")
           rr
         }
+
         assetHelper.withCleaner(wsk.action, "unauthorized sequence", confirmDelete = false) { (action, name) =>
           val rr = action.create(
             name,
@@ -271,16 +272,17 @@ class WskEntitlementTests extends TestHelpers with WskTestHelpers with BeforeAnd
   it should "not allow invoke an action sequence with more than one component from package after entitlement change" in withAssetCleaner(
     guestWskProps) { (guestwp, assetHelper) =>
     val privateSamplePackage = samplePackage + "prv"
-    assetHelper.withCleaner(wsk.pkg, samplePackage) { (pkg, _) =>
-      pkg.create(samplePackage, parameters = Map("a" -> "A".toJson), shared = Some(true))(guestwp)
-      pkg.create(privateSamplePackage, parameters = Map("a" -> "A".toJson), shared = Some(true))(guestwp)
+    Seq(samplePackage, privateSamplePackage).foreach { n =>
+      assetHelper.withCleaner(wsk.pkg, n) { (pkg, _) =>
+        pkg.create(n, parameters = Map("a" -> "A".toJson), shared = Some(true))(guestwp)
+      }
     }
 
-    assetHelper.withCleaner(wsk.action, fullSampleActionName) {
+    Seq(fullSampleActionName, s"$privateSamplePackage/$sampleAction").foreach { a =>
       val file = Some(TestCLIUtils.getTestActionFilename("hello.js"))
-      (action, _) =>
-        action.create(fullSampleActionName, file)(guestwp)
-        action.create(s"$privateSamplePackage/$sampleAction", file)(guestwp)
+      assetHelper.withCleaner(wsk.action, a) { (action, _) =>
+        action.create(a, file)(guestwp)
+      }
     }
 
     withAssetCleaner(defaultWskProps) { (dwp, assetHelper) =>

-- 
To stop receiving notification emails like this one, please contact
"commits@openwhisk.apache.org" <co...@openwhisk.apache.org>.