Repository: ambari Updated Branches: refs/heads/trunk 03e41db82 -> 5416153e9
AMBARI-16719. Enable Enable authentication using Ambari for LogSearch -appendum (Miklos Gergely via oleewere) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/5416153e Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/5416153e Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/5416153e Branch: refs/heads/trunk Commit: 5416153e938c2f3a2eca16245e7f9739a079cb45 Parents: 03e41db Author: oleewere <oleew...@gmail.com> Authored: Thu Jun 2 10:09:34 2016 +0200 Committer: oleewere <oleew...@gmail.com> Committed: Thu Jun 2 10:09:34 2016 +0200 ---------------------------------------------------------------------- .../internal/ClusterStackVersionResourceProviderTest.java | 9 ++++----- .../internal/HostStackVersionResourceProviderTest.java | 4 ++-- 2 files changed, 6 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/5416153e/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ClusterStackVersionResourceProviderTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ClusterStackVersionResourceProviderTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ClusterStackVersionResourceProviderTest.java index f3c90a1..236401a 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ClusterStackVersionResourceProviderTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ClusterStackVersionResourceProviderTest.java @@ -751,8 +751,8 @@ public class ClusterStackVersionResourceProviderTest { expect(clusterVersionDAO.findByClusterAndStackAndVersion(anyObject(String.class), anyObject(StackId.class), anyObject(String.class))).andReturn(cve); - TopologyManager topologyManager = injector.getInstance(TopologyManager.class); - StageUtils.setTopologyManager(topologyManager); + StageUtils.setTopologyManager(injector.getInstance(TopologyManager.class)); + StageUtils.setConfiguration(injector.getInstance(Configuration.class)); // replay replay(managementController, response, clusters, hdfsService, hbaseService, resourceProviderFactory, csvResourceProvider, @@ -1451,9 +1451,8 @@ public class ClusterStackVersionResourceProviderTest { expect(clusterVersionDAO.findByClusterAndStackAndVersion(anyObject(String.class), anyObject(StackId.class), anyObject(String.class))).andReturn(cve); - TopologyManager topologyManager = injector.getInstance(TopologyManager.class); - StageUtils.setTopologyManager(topologyManager); - + StageUtils.setTopologyManager(injector.getInstance(TopologyManager.class)); + StageUtils.setConfiguration(injector.getInstance(Configuration.class)); // !!! make it look like there is already a versioned installed that is less than the one being installed ClusterVersionEntity bad = new ClusterVersionEntity(); http://git-wip-us.apache.org/repos/asf/ambari/blob/5416153e/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/HostStackVersionResourceProviderTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/HostStackVersionResourceProviderTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/HostStackVersionResourceProviderTest.java index 0c42d37..7fc8a90 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/HostStackVersionResourceProviderTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/HostStackVersionResourceProviderTest.java @@ -346,8 +346,8 @@ public class HostStackVersionResourceProviderTest { expect(actionManager.getRequestTasks(anyLong())).andReturn(Collections.<HostRoleCommand>emptyList()).anyTimes(); - TopologyManager topologyManager = injector.getInstance(TopologyManager.class); - StageUtils.setTopologyManager(topologyManager); + StageUtils.setTopologyManager(injector.getInstance(TopologyManager.class)); + StageUtils.setConfiguration(injector.getInstance(Configuration.class)); // replay replay(managementController, response, clusters, resourceProviderFactory, csvResourceProvider,
