Repository: ranger Updated Branches: refs/heads/master 33bf690cc -> 9e8bfb9c2
RANGER-1842 - Don't catch Throwables in the test code Signed-off-by: Colm O hEigeartaigh <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/ranger/repo Commit: http://git-wip-us.apache.org/repos/asf/ranger/commit/9e8bfb9c Tree: http://git-wip-us.apache.org/repos/asf/ranger/tree/9e8bfb9c Diff: http://git-wip-us.apache.org/repos/asf/ranger/diff/9e8bfb9c Branch: refs/heads/master Commit: 9e8bfb9c28cc8eee2972e62dd256e8aa9d933c1e Parents: 33bf690 Author: Colm O hEigeartaigh <[email protected]> Authored: Tue Oct 17 10:47:47 2017 +0100 Committer: Colm O hEigeartaigh <[email protected]> Committed: Fri Oct 20 09:58:10 2017 +0100 ---------------------------------------------------------------------- .../hadoop/crypto/key/kms/server/RangerMasterKeyTest.java | 4 ++-- .../authorization/storm/StormRangerAuthorizerTest.java | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ranger/blob/9e8bfb9c/kms/src/test/java/org/apache/hadoop/crypto/key/kms/server/RangerMasterKeyTest.java ---------------------------------------------------------------------- diff --git a/kms/src/test/java/org/apache/hadoop/crypto/key/kms/server/RangerMasterKeyTest.java b/kms/src/test/java/org/apache/hadoop/crypto/key/kms/server/RangerMasterKeyTest.java index cac2250..f420322 100644 --- a/kms/src/test/java/org/apache/hadoop/crypto/key/kms/server/RangerMasterKeyTest.java +++ b/kms/src/test/java/org/apache/hadoop/crypto/key/kms/server/RangerMasterKeyTest.java @@ -96,7 +96,7 @@ public class RangerMasterKeyTest { try { rangerMasterKey.getMasterKey("badpass"); Assert.fail("Failure expected on retrieving a key with the wrong password"); - } catch (Throwable t) { + } catch (Exception ex) { // expected } @@ -105,7 +105,7 @@ public class RangerMasterKeyTest { try { rangerMasterKey.getMasterSecretKey("badpass"); Assert.fail("Failure expected on retrieving a key with the wrong password"); - } catch (Throwable t) { + } catch (Exception ex) { // expected } } http://git-wip-us.apache.org/repos/asf/ranger/blob/9e8bfb9c/storm-agent/src/test/java/org/apache/ranger/authorization/storm/StormRangerAuthorizerTest.java ---------------------------------------------------------------------- diff --git a/storm-agent/src/test/java/org/apache/ranger/authorization/storm/StormRangerAuthorizerTest.java b/storm-agent/src/test/java/org/apache/ranger/authorization/storm/StormRangerAuthorizerTest.java index 5317307..2e72193 100644 --- a/storm-agent/src/test/java/org/apache/ranger/authorization/storm/StormRangerAuthorizerTest.java +++ b/storm-agent/src/test/java/org/apache/ranger/authorization/storm/StormRangerAuthorizerTest.java @@ -97,7 +97,7 @@ public class StormRangerAuthorizerTest { try { cluster.submitTopology("word-count2", conf, builder.createTopology()); Assert.fail("Authorization failure expected"); - } catch (Throwable ex) { + } catch (Exception ex) { // expected } @@ -129,7 +129,7 @@ public class StormRangerAuthorizerTest { try { cluster.deactivate("temp1"); Assert.fail("Authorization failure expected"); - } catch (Throwable ex) { + } catch (Exception ex) { // expected } @@ -165,7 +165,7 @@ public class StormRangerAuthorizerTest { try { cluster.rebalance("temp2", options); Assert.fail("Authorization failure expected"); - } catch (Throwable ex) { + } catch (Exception ex) { // expected } @@ -200,7 +200,7 @@ public class StormRangerAuthorizerTest { try { cluster.submitTopology("stormdev2", conf, builder.createTopology()); Assert.fail("Authorization failure expected"); - } catch (Throwable ex) { + } catch (Exception ex) { // expected }
