You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by dm...@apache.org on 2015/12/06 16:44:09 UTC
ambari git commit: AMBARI-14235. UT failure:
org.apache.ambari.server.checks.InstallPackagesCheckTest.testPerform
(dlysnichenko)
Repository: ambari
Updated Branches:
refs/heads/branch-2.2 16307d4d2 -> c6fecb777
AMBARI-14235. UT failure: org.apache.ambari.server.checks.InstallPackagesCheckTest.testPerform (dlysnichenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/c6fecb77
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/c6fecb77
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/c6fecb77
Branch: refs/heads/branch-2.2
Commit: c6fecb7773ecf40a0a4e4b78067455c342a8dd35
Parents: 16307d4
Author: Lisnichenko Dmitro <dl...@hortonworks.com>
Authored: Sun Dec 6 17:43:27 2015 +0200
Committer: Lisnichenko Dmitro <dl...@hortonworks.com>
Committed: Sun Dec 6 17:43:27 2015 +0200
----------------------------------------------------------------------
.../server/checks/InstallPackagesCheck.java | 2 +-
.../server/checks/InstallPackagesCheckTest.java | 20 +++++++++++++++++---
2 files changed, 18 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/c6fecb77/ambari-server/src/main/java/org/apache/ambari/server/checks/InstallPackagesCheck.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/checks/InstallPackagesCheck.java b/ambari-server/src/main/java/org/apache/ambari/server/checks/InstallPackagesCheck.java
index b80d6e6..334b434 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/checks/InstallPackagesCheck.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/checks/InstallPackagesCheck.java
@@ -61,7 +61,7 @@ public class InstallPackagesCheck extends AbstractCheckDescriptor {
final String repoVersion = request.getRepositoryVersion();
final RepositoryVersionEntity rve = repositoryVersionDaoProvider.get().findByStackNameAndVersion(stackName, request.getRepositoryVersion());
- if (rve.getVersion().indexOf("-") < 100 ) {
+ if (rve.getVersion().indexOf("-") < 0 ) {
String message = MessageFormat.format("The Repository Version {0} for Stack {1} must contain a \"-\" followed by a build number. " +
"Make sure that another registered repository does not have the same repo URL or " +
"shares the same build number. Next, try reinstalling the Repository Version.", rve.getVersion(), rve.getStackVersion());
http://git-wip-us.apache.org/repos/asf/ambari/blob/c6fecb77/ambari-server/src/test/java/org/apache/ambari/server/checks/InstallPackagesCheckTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/checks/InstallPackagesCheckTest.java b/ambari-server/src/test/java/org/apache/ambari/server/checks/InstallPackagesCheckTest.java
index 18672e3..70876e2 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/checks/InstallPackagesCheckTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/checks/InstallPackagesCheckTest.java
@@ -26,9 +26,11 @@ import org.apache.ambari.server.configuration.Configuration;
import org.apache.ambari.server.controller.PrereqCheckRequest;
import org.apache.ambari.server.orm.dao.ClusterVersionDAO;
import org.apache.ambari.server.orm.dao.HostVersionDAO;
+import org.apache.ambari.server.orm.dao.RepositoryVersionDAO;
import org.apache.ambari.server.orm.entities.ClusterVersionEntity;
import org.apache.ambari.server.orm.entities.HostVersionEntity;
import org.apache.ambari.server.orm.entities.RepositoryVersionEntity;
+import org.apache.ambari.server.orm.entities.StackEntity;
import org.apache.ambari.server.orm.models.HostComponentSummary;
import org.apache.ambari.server.state.Cluster;
import org.apache.ambari.server.state.Clusters;
@@ -60,6 +62,7 @@ public class InstallPackagesCheckTest {
private final Clusters clusters = Mockito.mock(Clusters.class);
private final ClusterVersionDAO clusterVersionDAO = Mockito.mock(ClusterVersionDAO.class);
private final HostVersionDAO hostVersionDAO = Mockito.mock(HostVersionDAO.class);
+ private final RepositoryVersionDAO repositoryVersionDAO = Mockito.mock(RepositoryVersionDAO.class);
private AmbariMetaInfo ambariMetaInfo = Mockito.mock(AmbariMetaInfo.class);
private StackId sourceStackId = new StackId("HDP", "2.2");
private StackId targetStackId = new StackId("HDP", "2.2");
@@ -83,6 +86,7 @@ public class InstallPackagesCheckTest {
@Test
public void testPerform() throws Exception {
+ StackId stackId = new StackId("HDP", "2.2");
PowerMockito.mockStatic(HostComponentSummary.class);
final InstallPackagesCheck installPackagesCheck = new InstallPackagesCheck();
@@ -115,10 +119,22 @@ public class InstallPackagesCheckTest {
}
};
+ installPackagesCheck.repositoryVersionDaoProvider = new Provider<RepositoryVersionDAO>() {
+ @Override
+ public RepositoryVersionDAO get() {
+ return repositoryVersionDAO;
+ }
+ };
+ StackEntity stack = new StackEntity();
+ stack.setStackName(stackId.getStackName());
+ stack.setStackVersion(stackId.getStackVersion());
+ RepositoryVersionEntity rve = new RepositoryVersionEntity(stack, repositoryVersion, repositoryVersion, "rhel6");
+ Mockito.when(repositoryVersionDAO.findByStackNameAndVersion(Mockito.anyString(), Mockito.anyString())).thenReturn(rve);
final Cluster cluster = Mockito.mock(Cluster.class);
Mockito.when(cluster.getClusterName()).thenReturn(clusterName);
Mockito.when(cluster.getClusterId()).thenReturn(1L);
- Mockito.when(cluster.getCurrentStackVersion()).thenReturn(new StackId("HDP", "2.2"));
+
+ Mockito.when(cluster.getCurrentStackVersion()).thenReturn(stackId);
Mockito.when(clusters.getCluster(clusterName)).thenReturn(cluster);
ClusterVersionEntity clusterVersionEntity = Mockito.mock(ClusterVersionEntity.class);
Mockito.when(clusterVersionEntity.getState()).thenReturn(RepositoryVersionState.INSTALLED);
@@ -128,8 +144,6 @@ public class InstallPackagesCheckTest {
hostNames.add("host1");
hostNames.add("host2");
hostNames.add("host3");
- RepositoryVersionEntity rve = Mockito.mock(RepositoryVersionEntity.class);
- Mockito.when(rve.getVersion()).thenReturn(repositoryVersion);
final List<Host> hosts = new ArrayList<Host>();
final List<HostVersionEntity> hostVersionEntities = new ArrayList<HostVersionEntity>();