You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by vb...@apache.org on 2014/01/14 10:41:45 UTC
git commit: AMBARI-4274. ambari-agent unit test failures.(vbrodetskyi)
Updated Branches:
refs/heads/trunk 04fa77eba -> b1d187fb2
AMBARI-4274. ambari-agent unit test failures.(vbrodetskyi)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/b1d187fb
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/b1d187fb
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/b1d187fb
Branch: refs/heads/trunk
Commit: b1d187fb29f27a2013dd13072cc58b70ac0fb88b
Parents: 04fa77e
Author: Vitaly Brodetskyi <vb...@hortonworks.com>
Authored: Tue Jan 14 11:40:47 2014 +0200
Committer: Vitaly Brodetskyi <vb...@hortonworks.com>
Committed: Tue Jan 14 11:40:47 2014 +0200
----------------------------------------------------------------------
ambari-agent/src/main/python/ambari_agent/PuppetExecutor.py | 2 +-
ambari-agent/src/main/python/ambari_agent/test.json | 2 +-
.../src/test/python/ambari_agent/TestPuppetExecutor.py | 6 +++---
3 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/b1d187fb/ambari-agent/src/main/python/ambari_agent/PuppetExecutor.py
----------------------------------------------------------------------
diff --git a/ambari-agent/src/main/python/ambari_agent/PuppetExecutor.py b/ambari-agent/src/main/python/ambari_agent/PuppetExecutor.py
index b69e8ae..00c5c98 100644
--- a/ambari-agent/src/main/python/ambari_agent/PuppetExecutor.py
+++ b/ambari-agent/src/main/python/ambari_agent/PuppetExecutor.py
@@ -159,7 +159,7 @@ class PuppetExecutor:
java64_home = str(command['hostLevelParams']['java_home']).strip()
if java64_home is None or not self.isJavaAvailable(java64_home):
if java64_home is None:
- errMsg = "Cannot access JDK! Make sure java_home is specified in global config"
+ errMsg = "Cannot access JDK! Make sure java_home is specified in hostLevelParams"
else:
errMsg = JAVANOTVALID_MSG.format(java64_home)
return {'stdout': '', 'stderr': errMsg, 'exitcode': 1}
http://git-wip-us.apache.org/repos/asf/ambari/blob/b1d187fb/ambari-agent/src/main/python/ambari_agent/test.json
----------------------------------------------------------------------
diff --git a/ambari-agent/src/main/python/ambari_agent/test.json b/ambari-agent/src/main/python/ambari_agent/test.json
index efad2cc..6da53da 100644
--- a/ambari-agent/src/main/python/ambari_agent/test.json
+++ b/ambari-agent/src/main/python/ambari_agent/test.json
@@ -13,7 +13,7 @@
{
"hdfs_user" : "hdfs",
"jdk_location" : "http://hdp1/downloads",
-
+"java_home" : " java64_home ",
"java32_home" : "/usr/jdk64/jdk1.6.0_31",
"java64_home" : "/usr/jdk64/jdk1.6.0_31",
"jdk_bins" : { "32" : "jdk-6u31-linux-x64.bin", "64" : "jdk-6u31-linux-x64.bin" },
http://git-wip-us.apache.org/repos/asf/ambari/blob/b1d187fb/ambari-agent/src/test/python/ambari_agent/TestPuppetExecutor.py
----------------------------------------------------------------------
diff --git a/ambari-agent/src/test/python/ambari_agent/TestPuppetExecutor.py b/ambari-agent/src/test/python/ambari_agent/TestPuppetExecutor.py
index d98a437..9e6da16 100644
--- a/ambari-agent/src/test/python/ambari_agent/TestPuppetExecutor.py
+++ b/ambari-agent/src/test/python/ambari_agent/TestPuppetExecutor.py
@@ -98,7 +98,7 @@ class TestPuppetExecutor(TestCase):
puppetInstance.reposInstalled = False
isJavaAvailableMock.return_value = False
parsedJson['roleCommand'] = "START"
- parsedJson['configurations'] = {'global':{'java64_home':'/usr/jdk/jdk123'}}
+ parsedJson['hostLevelParams'] = {'java_home':'/usr/jdk/jdk123'}
res = puppetInstance.runCommand(parsedJson, tmpdir + '/out.txt', tmpdir + '/err.txt')
JAVANOTVALID_MSG = "Cannot access JDK! Make sure you have permission to execute {0}/bin/java"
@@ -107,10 +107,10 @@ class TestPuppetExecutor(TestCase):
self.assertEquals(res["stderr"], errMsg)
self.assertFalse(puppetInstance.reposInstalled)
- parsedJson['configurations'] = {'random':{'name1':'value2'}}
+ parsedJson['hostLevelParams'] = {'random':{'name1':'value2'}}
res = puppetInstance.runCommand(parsedJson, tmpdir + '/out.txt', tmpdir + '/err.txt')
self.assertEquals(res["exitcode"], 1)
- self.assertEquals(res["stderr"], "Cannot access JDK! Make sure java64_home is specified in global config")
+ self.assertEquals(res["stderr"], "Cannot access JDK! Make sure java_home is specified in hostLevelParams")
@patch.object(PuppetExecutor, 'isJavaAvailable')