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 2013/11/25 16:22:50 UTC
[2/2] git commit: AMBARI-3871. When adding nodes to an existing
cluster yum should specify a specific ambari-agent version (Dmytro Shkvyra
via dlysnichenko)
AMBARI-3871. When adding nodes to an existing cluster yum should specify a specific ambari-agent version (Dmytro Shkvyra via dlysnichenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/c4f264ac
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/c4f264ac
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/c4f264ac
Branch: refs/heads/trunk
Commit: c4f264ac530d13696b721a519e14877dd9831600
Parents: 093c8af
Author: Lisnichenko Dmitro <dl...@hortonworks.com>
Authored: Mon Nov 25 17:22:21 2013 +0200
Committer: Lisnichenko Dmitro <dl...@hortonworks.com>
Committed: Mon Nov 25 17:22:21 2013 +0200
----------------------------------------------------------------------
ambari-server/src/main/python/setupAgent.py | 2 +-
ambari-server/src/test/python/TestSetupAgent.py | 27 +++-----------------
2 files changed, 4 insertions(+), 25 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/c4f264ac/ambari-server/src/main/python/setupAgent.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/python/setupAgent.py b/ambari-server/src/main/python/setupAgent.py
index fdac9c9..be62d8d 100755
--- a/ambari-server/src/main/python/setupAgent.py
+++ b/ambari-server/src/main/python/setupAgent.py
@@ -90,7 +90,7 @@ def getOptimalVersion(initialProjectVersion):
else:
ret = findNearestAgentPackageVersion(optimalVersion)
- if ret["exitstatus"] == 0 and ret["log"][0].strip() != "":
+ if ret["exitstatus"] == 0 and ret["log"][0].strip() != "" and ret["log"][0].strip() == initialProjectVersion:
optimalVersion = ret["log"][0].strip()
retcode = 0
else:
http://git-wip-us.apache.org/repos/asf/ambari/blob/c4f264ac/ambari-server/src/test/python/TestSetupAgent.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/TestSetupAgent.py b/ambari-server/src/test/python/TestSetupAgent.py
index 9edadc5..7846220 100644
--- a/ambari-server/src/test/python/TestSetupAgent.py
+++ b/ambari-server/src/test/python/TestSetupAgent.py
@@ -115,7 +115,7 @@ class TestSetupAgent(TestCase):
self.assertTrue(findNearestAgentPackageVersionSuse_method.called)
self.assertFalse(findNearestAgentPackageVersion_method.called)
- self.assertTrue(result_version["log"] == nearest_version)
+ self.assertTrue(result_version["exitstatus"] == 1)
pass
@@ -136,27 +136,6 @@ class TestSetupAgent(TestCase):
self.assertTrue(result_version["log"] == projectVersion)
pass
- @patch.object(setup_agent, 'is_suse')
- @patch.object(setup_agent, 'findNearestAgentPackageVersionSuse')
- @patch.object(setup_agent, 'findNearestAgentPackageVersion')
- def test_returned_optimal_version_is_nearest(self, findNearestAgentPackageVersion_method,
- findNearestAgentPackageVersionSuse_method,
- is_suse_method):
- is_suse_method.return_value = False
-
- projectVersion = ""
- nearest_version = projectVersion + "1.1.1"
- findNearestAgentPackageVersion_method.return_value = {
- "exitstatus" : 0,
- "log": [nearest_version, ""]
- }
-
- result_version = setup_agent.getOptimalVersion(projectVersion)
-
- self.assertFalse(findNearestAgentPackageVersionSuse_method.called)
- self.assertTrue(findNearestAgentPackageVersion_method.called)
- self.assertTrue(result_version["log"] == nearest_version)
- pass
@patch.object(setup_agent, 'getAvaliableAgentPackageVersions')
@patch.object(setup_agent, 'is_suse')
@@ -169,7 +148,7 @@ class TestSetupAgent(TestCase):
is_suse_method.return_value = False
findNearestAgentPackageVersion_method.return_value = {
"exitstatus" : 0,
- "log": ["", ""]
+ "log": ["1.1.1.1", ""]
}
projectVersion = "1.1.1"
@@ -177,7 +156,7 @@ class TestSetupAgent(TestCase):
self.assertFalse(findNearestAgentPackageVersionSuse_method.called)
self.assertTrue(findNearestAgentPackageVersion_method.called)
- self.assertTrue(result_version["log"] == "1.1.1")
+ self.assertTrue(result_version["exitstatus"] == 1)
@patch.object(subprocess, 'Popen')
def test_execOsCommand(self, Popen_mock):