Repository: incubator-slider Updated Branches: refs/heads/develop 0d2a35bb6 -> 7a1a590f3
SLIDER-741 fix failing test Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/7a1a590f Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/7a1a590f Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/7a1a590f Branch: refs/heads/develop Commit: 7a1a590f3bf980b8ab4de154f5a7f8b1f0b0ba5d Parents: 0d2a35b Author: Steve Loughran <[email protected]> Authored: Wed Jan 7 11:45:57 2015 +0000 Committer: Steve Loughran <[email protected]> Committed: Wed Jan 7 11:45:57 2015 +0000 ---------------------------------------------------------------------- .../web/rest/application/resources/AppconfRefresher.java | 2 +- .../slider/agent/standalone/TestStandaloneAgentWeb.groovy | 4 ++-- .../groovy/org/apache/slider/test/SliderTestUtils.groovy | 8 ++++---- 3 files changed, 7 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/7a1a590f/slider-core/src/main/java/org/apache/slider/server/appmaster/web/rest/application/resources/AppconfRefresher.java ---------------------------------------------------------------------- diff --git a/slider-core/src/main/java/org/apache/slider/server/appmaster/web/rest/application/resources/AppconfRefresher.java b/slider-core/src/main/java/org/apache/slider/server/appmaster/web/rest/application/resources/AppconfRefresher.java index 65582ed..06460cc 100644 --- a/slider-core/src/main/java/org/apache/slider/server/appmaster/web/rest/application/resources/AppconfRefresher.java +++ b/slider-core/src/main/java/org/apache/slider/server/appmaster/web/rest/application/resources/AppconfRefresher.java @@ -49,7 +49,7 @@ public class AppconfRefresher state.getUnresolvedInstanceDefinition(): state.getInstanceDefinitionSnapshot(); ConfTree ct = resources ? aggregateConf.getResources() - : aggregateConf.getResources(); + : aggregateConf.getAppConf(); return new ConfTreeSerDeser().fromInstance(ct); } } http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/7a1a590f/slider-core/src/test/groovy/org/apache/slider/agent/standalone/TestStandaloneAgentWeb.groovy ---------------------------------------------------------------------- diff --git a/slider-core/src/test/groovy/org/apache/slider/agent/standalone/TestStandaloneAgentWeb.groovy b/slider-core/src/test/groovy/org/apache/slider/agent/standalone/TestStandaloneAgentWeb.groovy index 6df0452..7a62c83 100644 --- a/slider-core/src/test/groovy/org/apache/slider/agent/standalone/TestStandaloneAgentWeb.groovy +++ b/slider-core/src/test/groovy/org/apache/slider/agent/standalone/TestStandaloneAgentWeb.groovy @@ -211,12 +211,12 @@ class TestStandaloneAgentWeb extends AgentMiniClusterTestBase { def unresolved = fetchTypeList(ConfTree, appmaster, [MODEL_DESIRED_APPCONF, MODEL_DESIRED_RESOURCES]) - assert unresolved[0].components[sam][TEST_GLOBAL_OPTION] == null + assert unresolved[MODEL_DESIRED_APPCONF].components[sam][TEST_GLOBAL_OPTION] == null def resolved = fetchTypeList(ConfTree, appmaster, [MODEL_RESOLVED_APPCONF, MODEL_RESOLVED_RESOURCES]) - assert resolved[0].components[sam][TEST_GLOBAL_OPTION] == + assert resolved[MODEL_RESOLVED_APPCONF].components[sam][TEST_GLOBAL_OPTION] == TEST_GLOBAL_OPTION_PRESENT } http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/7a1a590f/slider-core/src/test/groovy/org/apache/slider/test/SliderTestUtils.groovy ---------------------------------------------------------------------- diff --git a/slider-core/src/test/groovy/org/apache/slider/test/SliderTestUtils.groovy b/slider-core/src/test/groovy/org/apache/slider/test/SliderTestUtils.groovy index 806285b..cd78c6c 100644 --- a/slider-core/src/test/groovy/org/apache/slider/test/SliderTestUtils.groovy +++ b/slider-core/src/test/groovy/org/apache/slider/test/SliderTestUtils.groovy @@ -1190,14 +1190,14 @@ class SliderTestUtils extends Assert { * @param clazz class of resolved values * @param appmaster URL to app master * @param subpaths list of subpaths - * @return a list of values in the same order as the paths passed in + * @return a map of paths to values */ - public <T> List<T> fetchTypeList( + public <T> Map<String, T> fetchTypeList( Class<T> clazz, String appmaster, List<String> subpaths ) { - List<T> results = [] + Map < String, T > results = [:] subpaths.each { String it -> - results.add(fetchType(clazz, appmaster, it)) + results[it] = (fetchType(clazz, appmaster, it)) } return results; }
