You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by nc...@apache.org on 2016/06/02 10:52:12 UTC
ambari git commit: AMBARI-16719. Enable Enable authentication using
Ambari for LogSearch -appendum 2 (ncole)
Repository: ambari
Updated Branches:
refs/heads/trunk affeb7f8a -> 688e61ad3
AMBARI-16719. Enable Enable authentication using Ambari for LogSearch -appendum 2 (ncole)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/688e61ad
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/688e61ad
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/688e61ad
Branch: refs/heads/trunk
Commit: 688e61ad3d28c998af848c8c1584ef4aaabd3e79
Parents: affeb7f
Author: Nate Cole <nc...@hortonworks.com>
Authored: Thu Jun 2 06:47:32 2016 -0400
Committer: Nate Cole <nc...@hortonworks.com>
Committed: Thu Jun 2 06:50:10 2016 -0400
----------------------------------------------------------------------
.../internal/ClusterStackVersionResourceProviderTest.java | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/688e61ad/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 236401a..a438edb 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,6 +751,7 @@ public class ClusterStackVersionResourceProviderTest {
expect(clusterVersionDAO.findByClusterAndStackAndVersion(anyObject(String.class),
anyObject(StackId.class), anyObject(String.class))).andReturn(cve);
+
StageUtils.setTopologyManager(injector.getInstance(TopologyManager.class));
StageUtils.setConfiguration(injector.getInstance(Configuration.class));
@@ -964,8 +965,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));
expect(clusterVersionDAO.findByCluster(anyObject(String.class))).andReturn(Collections.<ClusterVersionEntity>emptyList()).once();
@@ -1451,8 +1452,9 @@ public class ClusterStackVersionResourceProviderTest {
expect(clusterVersionDAO.findByClusterAndStackAndVersion(anyObject(String.class),
anyObject(StackId.class), anyObject(String.class))).andReturn(cve);
- StageUtils.setTopologyManager(injector.getInstance(TopologyManager.class));
- StageUtils.setConfiguration(injector.getInstance(Configuration.class));
+ TopologyManager topologyManager = injector.getInstance(TopologyManager.class);
+ StageUtils.setTopologyManager(topologyManager);
+
// !!! make it look like there is already a versioned installed that is less than the one being installed
ClusterVersionEntity bad = new ClusterVersionEntity();