Repository: accumulo Updated Branches: refs/heads/master a6133a6ae -> 584b81212
ACCUMULO-4188 Fix PowerMock issue in ShellSetInstanceTest Instruct PowerMock to ignore javax.security.* classes in its classloader Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/584b8121 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/584b8121 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/584b8121 Branch: refs/heads/master Commit: 584b8121288c109945da62c97ea8727956de38bf Parents: a6133a6 Author: Christopher Tubbs <ctubb...@apache.org> Authored: Tue Apr 12 17:15:23 2016 -0400 Committer: Christopher Tubbs <ctubb...@apache.org> Committed: Tue Apr 12 17:15:23 2016 -0400 ---------------------------------------------------------------------- .../test/java/org/apache/accumulo/shell/ShellSetInstanceTest.java | 2 ++ 1 file changed, 2 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/584b8121/shell/src/test/java/org/apache/accumulo/shell/ShellSetInstanceTest.java ---------------------------------------------------------------------- diff --git a/shell/src/test/java/org/apache/accumulo/shell/ShellSetInstanceTest.java b/shell/src/test/java/org/apache/accumulo/shell/ShellSetInstanceTest.java index 4d2645b..331b183 100644 --- a/shell/src/test/java/org/apache/accumulo/shell/ShellSetInstanceTest.java +++ b/shell/src/test/java/org/apache/accumulo/shell/ShellSetInstanceTest.java @@ -55,10 +55,12 @@ import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; import org.junit.runner.RunWith; +import org.powermock.core.classloader.annotations.PowerMockIgnore; import org.powermock.core.classloader.annotations.PrepareForTest; import org.powermock.modules.junit4.PowerMockRunner; @RunWith(PowerMockRunner.class) +@PowerMockIgnore("javax.security.*") @PrepareForTest({Shell.class, ZooUtil.class, ConfigSanityCheck.class}) public class ShellSetInstanceTest { public static class TestOutputStream extends OutputStream {
