karaf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dav...@apache.org
Subject git commit: Re-enable itests for feature shell command security ACL
Date Mon, 20 Jan 2014 14:31:56 GMT
Updated Branches:
  refs/heads/master 7564c4dd4 -> 056fef39b


Re-enable itests for feature shell command security ACL

Changed slightly to address spurious failure


Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/056fef39
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/056fef39
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/056fef39

Branch: refs/heads/master
Commit: 056fef39b5e4602661d53007c0d8787c3f3b065e
Parents: 7564c4d
Author: David Bosschaert <davidb@apache.org>
Authored: Mon Jan 20 14:28:01 2014 +0000
Committer: David Bosschaert <davidb@apache.org>
Committed: Mon Jan 20 14:28:01 2014 +0000

----------------------------------------------------------------------
 .../itests/FeatureSshCommandSecurityTest.java   | 32 +++++++++-----------
 1 file changed, 14 insertions(+), 18 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/karaf/blob/056fef39/itests/src/test/java/org/apache/karaf/itests/FeatureSshCommandSecurityTest.java
----------------------------------------------------------------------
diff --git a/itests/src/test/java/org/apache/karaf/itests/FeatureSshCommandSecurityTest.java
b/itests/src/test/java/org/apache/karaf/itests/FeatureSshCommandSecurityTest.java
index cd08aca..76350c0 100644
--- a/itests/src/test/java/org/apache/karaf/itests/FeatureSshCommandSecurityTest.java
+++ b/itests/src/test/java/org/apache/karaf/itests/FeatureSshCommandSecurityTest.java
@@ -22,37 +22,33 @@ import org.junit.Test;
  */
 public class FeatureSshCommandSecurityTest extends SshCommandTestBase {
     @Test
-    public void testDummy() {
-        // The real test below sometimes fails. Comment it out until I've found what the
issues is...
-    }
-
     public void testFeatureCommandSecurityViaSsh() throws Exception {
         String vieweruser = "viewer" + System.nanoTime() + "_features";
 
         addViewer(vieweruser);
 
         String r = assertCommand(vieweruser, "feature:list -i --no-format", Result.OK);
-        Assert.assertFalse("Precondition failed, this test uses the transaction subsystem
to test features with...",
-                r.contains("transaction"));
+        Assert.assertFalse("Precondition failed, this test uses the eventadmin subsystem
to test features with...",
+                r.contains("eventadmin"));
 
-        assertCommand(vieweruser, "feature:install transaction", Result.NOT_FOUND);
+        assertCommand(vieweruser, "feature:install eventadmin", Result.NOT_FOUND);
         String r2 = assertCommand("karaf", "feature:list -i --no-format", Result.OK);
-        Assert.assertFalse("Transaction features should not have been installed, as viewer
doesn't have credentials",
-                r2.contains("transaction"));
+        Assert.assertFalse("eventadmin features should not have been installed, as viewer
doesn't have credentials",
+                r2.contains("eventadmin"));
 
-        assertCommand("karaf", "feature:install transaction", Result.OK);
+        assertCommand("karaf", "feature:install eventadmin", Result.OK);
         String r3 = assertCommand(vieweruser, "feature:list -i --no-format", Result.OK);
-        Assert.assertTrue("Transaction feature should have been installed by 'karaf' user",
-                r3.contains("transaction"));
+        Assert.assertTrue("eventadmin feature should have been installed by 'karaf' user",
+                r3.contains("eventadmin"));
 
-        assertCommand(vieweruser, "feature:uninstall transaction", Result.NOT_FOUND);
+        assertCommand(vieweruser, "feature:uninstall eventadmin", Result.NOT_FOUND);
         String r4 = assertCommand("karaf", "feature:list -i --no-format", Result.OK);
-        Assert.assertTrue("Transaction feature should still be there, as viewer doesn't have
credentials",
-                r4.contains("transaction"));
+        Assert.assertTrue("eventadmin feature should still be there, as viewer doesn't have
credentials",
+                r4.contains("eventadmin"));
 
-        assertCommand("karaf", "feature:uninstall transaction", Result.OK);
+        assertCommand("karaf", "feature:uninstall eventadmin", Result.OK);
         String r5 = assertCommand(vieweruser, "feature:list -i --no-format", Result.OK);
-        Assert.assertFalse("The transaction subsystem should have been uninstalled",
-                r5.contains("transaction"));
+        Assert.assertFalse("The eventadmin subsystem should have been uninstalled",
+                r5.contains("eventadmin"));
     }
 }


Mime
View raw message