Repository: incubator-slider Updated Branches: refs/heads/develop a07eaf0a0 -> b072b9fd6
Revert "Remove assertion which expected an exception in TestMockAppStateFlexDynamicRoles#testDynamicFlexAddRoleConflictingPriority" This reverts commit c552af880f8d66f63e4cefdde118045c4e4b4593. Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/d03b6780 Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/d03b6780 Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/d03b6780 Branch: refs/heads/develop Commit: d03b6780885c9069292768aa822820a96bd15305 Parents: a07eaf0 Author: Steve Loughran <ste...@apache.org> Authored: Sat Nov 1 11:20:32 2014 +0000 Committer: Steve Loughran <ste...@apache.org> Committed: Sat Nov 1 11:20:32 2014 +0000 ---------------------------------------------------------------------- .../model/appstate/TestMockAppStateFlexDynamicRoles.groovy | 1 + 1 file changed, 1 insertion(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/d03b6780/slider-core/src/test/groovy/org/apache/slider/server/appmaster/model/appstate/TestMockAppStateFlexDynamicRoles.groovy ---------------------------------------------------------------------- diff --git a/slider-core/src/test/groovy/org/apache/slider/server/appmaster/model/appstate/TestMockAppStateFlexDynamicRoles.groovy b/slider-core/src/test/groovy/org/apache/slider/server/appmaster/model/appstate/TestMockAppStateFlexDynamicRoles.groovy index aee2413..8308a13 100644 --- a/slider-core/src/test/groovy/org/apache/slider/server/appmaster/model/appstate/TestMockAppStateFlexDynamicRoles.groovy +++ b/slider-core/src/test/groovy/org/apache/slider/server/appmaster/model/appstate/TestMockAppStateFlexDynamicRoles.groovy @@ -123,6 +123,7 @@ class TestMockAppStateFlexDynamicRoles extends BaseMockAppStateTest try { appState.updateResourceDefinitions(cd.confTree); dumpClusterDescription("updated CD", appState.getClusterStatus()) + fail("Expected an exception") } catch (BadConfigException expected) { } }
