Repository: ambari Updated Branches: refs/heads/trunk 8778556f4 -> 7d9feb6af
http://git-wip-us.apache.org/repos/asf/ambari/blob/7d9feb6a/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_hcat_client.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_hcat_client.py b/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_hcat_client.py index 6da9d2f..2a5481c 100644 --- a/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_hcat_client.py +++ b/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_hcat_client.py @@ -28,7 +28,10 @@ class TestHcatClient(RMFTestCase): command = "configure", config_file="default.json" ) - + self.assertResourceCalled('Directory', '/etc/hive/conf', + owner = 'hcat', + group = 'hadoop', + ) self.assertResourceCalled('Directory', '/etc/hcatalog/conf', owner = 'hcat', group = 'hadoop', @@ -59,7 +62,10 @@ class TestHcatClient(RMFTestCase): command = "configure", config_file="secured.json" ) - + self.assertResourceCalled('Directory', '/etc/hive/conf', + owner = 'hcat', + group = 'hadoop', + ) self.assertResourceCalled('Directory', '/etc/hcatalog/conf', owner = 'hcat', group = 'hadoop', http://git-wip-us.apache.org/repos/asf/ambari/blob/7d9feb6a/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_hive_metastore.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_hive_metastore.py b/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_hive_metastore.py index 0bef64d..204e384 100644 --- a/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_hive_metastore.py +++ b/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_hive_metastore.py @@ -17,6 +17,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ''' +import os from mock.mock import MagicMock, call, patch from stacks.utils.RMFTestCase import * @@ -40,6 +41,8 @@ class TestHiveMetastore(RMFTestCase): self.assert_configure_default() self.assertResourceCalled('Execute', 'env HADOOP_HOME=/usr JAVA_HOME=/usr/jdk64/jdk1.7.0_45 /tmp/start_metastore_script /var/log/hive/hive.out /var/log/hive/hive.log /var/run/hive/hive.pid /etc/hive/conf.server /var/log/hive', not_if = 'ls /var/run/hive/hive.pid >/dev/null 2>&1 && ps `cat /var/run/hive/hive.pid` >/dev/null 2>&1', + environment = {'PATH' : os.environ['PATH'] + os.pathsep + "/usr/lib/hive/bin", + 'HADOOP_HOME' : '/usr'}, user = 'hive', ) self.assertResourceCalled('Execute', '/usr/jdk64/jdk1.7.0_45/bin/java -cp /usr/lib/ambari-agent/DBConnectionVerification.jar:/usr/share/java/mysql-connector-java.jar org.apache.ambari.server.DBConnectionVerification \'jdbc:mysql://c6402.ambari.apache.org/hive?createDatabaseIfNotExist=true\' hive \'!`"\'"\'"\' 1\' com.mysql.jdbc.Driver', @@ -78,8 +81,11 @@ class TestHiveMetastore(RMFTestCase): ) self.assert_configure_secured() + self.maxDiff = None self.assertResourceCalled('Execute', 'env HADOOP_HOME=/usr JAVA_HOME=/usr/jdk64/jdk1.7.0_45 /tmp/start_metastore_script /var/log/hive/hive.out /var/log/hive/hive.log /var/run/hive/hive.pid /etc/hive/conf.server /var/log/hive', not_if = 'ls /var/run/hive/hive.pid >/dev/null 2>&1 && ps `cat /var/run/hive/hive.pid` >/dev/null 2>&1', + environment = {'PATH' : os.environ['PATH'] + os.pathsep + "/usr/lib/hive/bin", + 'HADOOP_HOME' : '/usr'}, user = 'hive', ) self.assertResourceCalled('Execute', '/usr/jdk64/jdk1.7.0_45/bin/java -cp /usr/lib/ambari-agent/DBConnectionVerification.jar:/usr/share/java/mysql-connector-java.jar org.apache.ambari.server.DBConnectionVerification \'jdbc:mysql://c6402.ambari.apache.org/hive?createDatabaseIfNotExist=true\' hive \'!`"\'"\'"\' 1\' com.mysql.jdbc.Driver', @@ -196,6 +202,7 @@ class TestHiveMetastore(RMFTestCase): ) self.assertResourceCalled('Execute', 'hive mkdir -p /tmp/AMBARI-artifacts/ ; cp /usr/share/java/mysql-connector-java.jar /usr/lib/hive/lib//mysql-connector-java.jar', creates = '/usr/lib/hive/lib//mysql-connector-java.jar', + environment = {'PATH' : os.environ['PATH'] + os.pathsep + "/usr/lib/hive/bin"}, path = ['/bin', '/usr/bin/'], not_if = 'test -f /usr/lib/hive/lib//mysql-connector-java.jar', ) @@ -322,6 +329,7 @@ class TestHiveMetastore(RMFTestCase): self.assertResourceCalled('Execute', 'hive mkdir -p /tmp/AMBARI-artifacts/ ; cp /usr/share/java/mysql-connector-java.jar /usr/lib/hive/lib//mysql-connector-java.jar', creates = '/usr/lib/hive/lib//mysql-connector-java.jar', path = ['/bin', '/usr/bin/'], + environment = {'PATH' : os.environ['PATH'] + os.pathsep + "/usr/lib/hive/bin"}, not_if = 'test -f /usr/lib/hive/lib//mysql-connector-java.jar', ) self.assertResourceCalled('Execute', '/bin/sh -c \'cd /usr/lib/ambari-agent/ && curl -kf -x "" --retry 5 http://c6401.ambari.apache.org:8080/resources/DBConnectionVerification.jar -o DBConnectionVerification.jar\'', http://git-wip-us.apache.org/repos/asf/ambari/blob/7d9feb6a/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_hive_server.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_hive_server.py b/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_hive_server.py index 1c7e47e..bc723ab 100644 --- a/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_hive_server.py +++ b/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_hive_server.py @@ -17,6 +17,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ''' +import os from mock.mock import MagicMock, call, patch from stacks.utils.RMFTestCase import * @@ -53,6 +54,7 @@ class TestHiveServer(RMFTestCase): keytab = UnknownConfigurationMock(), conf_dir = '/etc/hadoop/conf', hdfs_user = 'hdfs', + bin_dir = '/usr/bin', kinit_path_local = "/usr/bin/kinit" ) @@ -64,6 +66,7 @@ class TestHiveServer(RMFTestCase): keytab = UnknownConfigurationMock(), conf_dir = '/etc/hadoop/conf', hdfs_user = 'hdfs', + bin_dir = '/usr/bin', kinit_path_local = "/usr/bin/kinit" ) self.assertResourceCalled('HdfsDirectory', None, @@ -72,6 +75,7 @@ class TestHiveServer(RMFTestCase): conf_dir = '/etc/hadoop/conf', hdfs_user = 'hdfs', kinit_path_local = '/usr/bin/kinit', + bin_dir = '/usr/bin', action = ['create'] ) @@ -80,6 +84,7 @@ class TestHiveServer(RMFTestCase): owner='tez', dest_dir='/apps/tez/', kinnit_if_needed='', + hadoop_conf_dir='/etc/hadoop/conf', hdfs_user='hdfs' ) @@ -88,11 +93,14 @@ class TestHiveServer(RMFTestCase): owner='tez', dest_dir='/apps/tez/lib/', kinnit_if_needed='', + hadoop_conf_dir='/etc/hadoop/conf', hdfs_user='hdfs' ) self.assertResourceCalled('Execute', 'env JAVA_HOME=/usr/jdk64/jdk1.7.0_45 /tmp/start_hiveserver2_script /var/log/hive/hive-server2.out /var/log/hive/hive-server2.log /var/run/hive/hive-server.pid /etc/hive/conf.server /var/log/hive', not_if = 'ls /var/run/hive/hive-server.pid >/dev/null 2>&1 && ps `cat /var/run/hive/hive-server.pid` >/dev/null 2>&1', + environment = {'PATH' : os.environ['PATH'] + os.pathsep + "/usr/lib/hive/bin", + 'HADOOP_HOME' : '/usr'}, user = 'hive' ) @@ -144,6 +152,8 @@ class TestHiveServer(RMFTestCase): self.assert_configure_secured() self.assertResourceCalled('Execute', 'env JAVA_HOME=/usr/jdk64/jdk1.7.0_45 /tmp/start_hiveserver2_script /var/log/hive/hive-server2.out /var/log/hive/hive-server2.log /var/run/hive/hive-server.pid /etc/hive/conf.server /var/log/hive', not_if = 'ls /var/run/hive/hive-server.pid >/dev/null 2>&1 && ps `cat /var/run/hive/hive-server.pid` >/dev/null 2>&1', + environment = {'PATH' : os.environ['PATH'] + os.pathsep + "/usr/lib/hive/bin", + 'HADOOP_HOME' : '/usr'}, user = 'hive' ) @@ -180,6 +190,7 @@ class TestHiveServer(RMFTestCase): kinit_path_local = '/usr/bin/kinit', mode = 0777, owner = 'hive', + bin_dir = '/usr/bin', action = ['create_delayed'], ) self.assertResourceCalled('HdfsDirectory', '/user/hive', @@ -190,6 +201,7 @@ class TestHiveServer(RMFTestCase): kinit_path_local = '/usr/bin/kinit', mode = 0700, owner = 'hive', + bin_dir = '/usr/bin', action = ['create_delayed'], ) self.assertResourceCalled('HdfsDirectory', None, @@ -198,6 +210,7 @@ class TestHiveServer(RMFTestCase): conf_dir = '/etc/hadoop/conf', hdfs_user = 'hdfs', kinit_path_local = '/usr/bin/kinit', + bin_dir = '/usr/bin', action = ['create'], ) self.assertResourceCalled('Directory', '/etc/hive/conf.server', @@ -295,6 +308,7 @@ class TestHiveServer(RMFTestCase): self.assertResourceCalled('Execute', 'hive mkdir -p /tmp/AMBARI-artifacts/ ; cp /usr/share/java/mysql-connector-java.jar /usr/lib/hive/lib//mysql-connector-java.jar', creates = '/usr/lib/hive/lib//mysql-connector-java.jar', path = ['/bin', '/usr/bin/'], + environment = {'PATH' : os.environ['PATH'] + os.pathsep + "/usr/lib/hive/bin"}, not_if = 'test -f /usr/lib/hive/lib//mysql-connector-java.jar', ) self.assertResourceCalled('Execute', '/bin/sh -c \'cd /usr/lib/ambari-agent/ && curl -kf -x "" --retry 5 http://c6401.ambari.apache.org:8080/resources/DBConnectionVerification.jar -o DBConnectionVerification.jar\'', @@ -331,6 +345,7 @@ class TestHiveServer(RMFTestCase): conf_dir = '/etc/hadoop/conf', hdfs_user = 'hdfs', kinit_path_local = '/usr/bin/kinit', + bin_dir = '/usr/bin', mode = 0777, owner = 'hive', action = ['create_delayed'], @@ -342,6 +357,7 @@ class TestHiveServer(RMFTestCase): hdfs_user = 'hdfs', kinit_path_local = '/usr/bin/kinit', mode = 0700, + bin_dir = '/usr/bin', owner = 'hive', action = ['create_delayed'], ) @@ -350,6 +366,7 @@ class TestHiveServer(RMFTestCase): keytab = '/etc/security/keytabs/hdfs.headless.keytab', conf_dir = '/etc/hadoop/conf', hdfs_user = 'hdfs', + bin_dir = '/usr/bin', kinit_path_local = '/usr/bin/kinit', action = ['create'], ) @@ -448,6 +465,7 @@ class TestHiveServer(RMFTestCase): self.assertResourceCalled('Execute', 'hive mkdir -p /tmp/AMBARI-artifacts/ ; cp /usr/share/java/mysql-connector-java.jar /usr/lib/hive/lib//mysql-connector-java.jar', creates = '/usr/lib/hive/lib//mysql-connector-java.jar', path = ['/bin', '/usr/bin/'], + environment = {'PATH' : os.environ['PATH'] + os.pathsep + "/usr/lib/hive/bin"}, not_if = 'test -f /usr/lib/hive/lib//mysql-connector-java.jar', ) self.assertResourceCalled('Execute', '/bin/sh -c \'cd /usr/lib/ambari-agent/ && curl -kf -x "" --retry 5 http://c6401.ambari.apache.org:8080/resources/DBConnectionVerification.jar -o DBConnectionVerification.jar\'', http://git-wip-us.apache.org/repos/asf/ambari/blob/7d9feb6a/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_hive_service_check.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_hive_service_check.py b/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_hive_service_check.py index eefb6b9..4ae9ad2 100644 --- a/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_hive_service_check.py +++ b/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_hive_service_check.py @@ -17,6 +17,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ''' +import os from mock.mock import MagicMock, call, patch from stacks.utils.RMFTestCase import * import datetime, sys, socket @@ -42,6 +43,7 @@ class TestServiceCheck(RMFTestCase): path = ['/usr/sbin', '/usr/local/nin', '/bin', '/usr/bin'], tries = 3, user = 'ambari-qa', + environment = {'PATH' : os.environ['PATH'] + os.pathsep + "/usr/lib/hive/bin"}, try_sleep = 5, ) self.assertResourceCalled('ExecuteHadoop', 'fs -test -e /apps/hive/warehouse/hcatsmoke', @@ -50,6 +52,7 @@ class TestServiceCheck(RMFTestCase): conf_dir = '/etc/hadoop/conf', keytab=UnknownConfigurationMock(), kinit_path_local='/usr/bin/kinit', + bin_dir = '/usr/lib/hive/bin', security_enabled=False ) self.assertResourceCalled('Execute', ' /tmp/hcatSmoke.sh hcatsmoke cleanup', @@ -57,6 +60,7 @@ class TestServiceCheck(RMFTestCase): path = ['/usr/sbin', '/usr/local/nin', '/bin', '/usr/bin'], tries = 3, user = 'ambari-qa', + environment = {'PATH' : os.environ['PATH'] + os.pathsep + "/usr/lib/hive/bin"}, try_sleep = 5, ) self.assertNoMoreResources() @@ -78,6 +82,7 @@ class TestServiceCheck(RMFTestCase): path = ['/usr/sbin', '/usr/local/nin', '/bin', '/usr/bin'], tries = 3, user = 'ambari-qa', + environment = {'PATH' : os.environ['PATH'] + os.pathsep + "/usr/lib/hive/bin"}, try_sleep = 5, ) self.assertResourceCalled('ExecuteHadoop', 'fs -test -e /apps/hive/warehouse/hcatsmoke', @@ -87,6 +92,7 @@ class TestServiceCheck(RMFTestCase): keytab='/etc/security/keytabs/hdfs.headless.keytab', kinit_path_local='/usr/bin/kinit', security_enabled=True, + bin_dir = '/usr/lib/hive/bin', principal='hdfs' ) self.assertResourceCalled('Execute', '/usr/bin/kinit -kt /etc/security/keytabs/smokeuser.headless.keytab ambari-qa; /tmp/hcatSmoke.sh hcatsmoke cleanup', @@ -94,6 +100,7 @@ class TestServiceCheck(RMFTestCase): path = ['/usr/sbin', '/usr/local/nin', '/bin', '/usr/bin'], tries = 3, user = 'ambari-qa', + environment = {'PATH' : os.environ['PATH'] + os.pathsep + "/usr/lib/hive/bin"}, try_sleep = 5, ) self.assertNoMoreResources() http://git-wip-us.apache.org/repos/asf/ambari/blob/7d9feb6a/ambari-server/src/test/python/stacks/2.0.6/OOZIE/test_oozie_server.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.0.6/OOZIE/test_oozie_server.py b/ambari-server/src/test/python/stacks/2.0.6/OOZIE/test_oozie_server.py index 1b98e45..5740587 100644 --- a/ambari-server/src/test/python/stacks/2.0.6/OOZIE/test_oozie_server.py +++ b/ambari-server/src/test/python/stacks/2.0.6/OOZIE/test_oozie_server.py @@ -45,8 +45,8 @@ class TestOozieServer(RMFTestCase): ignore_failures = True, user = 'oozie', ) - self.assertResourceCalled('Execute', ' hadoop dfs -put /usr/lib/oozie/share /user/oozie ; hadoop dfs -chmod -R 755 /user/oozie/share', - not_if = " hadoop dfs -ls /user/oozie/share | awk 'BEGIN {count=0;} /share/ {count++} END {if (count > 0) {exit 0} else {exit 1}}'", + self.assertResourceCalled('Execute', ' hadoop --config /etc/hadoop/conf dfs -put /usr/lib/oozie/share /user/oozie ; hadoop --config /etc/hadoop/conf dfs -chmod -R 755 /user/oozie/share', + not_if = " hadoop --config /etc/hadoop/conf dfs -ls /user/oozie/share | awk 'BEGIN {count=0;} /share/ {count++} END {if (count > 0) {exit 0} else {exit 1}}'", user = 'oozie', ) self.assertResourceCalled('Execute', 'cd /var/tmp/oozie && /usr/lib/oozie/bin/oozie-start.sh', @@ -91,8 +91,8 @@ class TestOozieServer(RMFTestCase): ignore_failures = True, user = 'oozie', ) - self.assertResourceCalled('Execute', '/usr/bin/kinit -kt /etc/security/keytabs/oozie.service.keytab oozie/c6402.ambari.apache....@example.com; hadoop dfs -put /usr/lib/oozie/share /user/oozie ; hadoop dfs -chmod -R 755 /user/oozie/share', - not_if = "/usr/bin/kinit -kt /etc/security/keytabs/oozie.service.keytab oozie/c6402.ambari.apache....@example.com; hadoop dfs -ls /user/oozie/share | awk 'BEGIN {count=0;} /share/ {count++} END {if (count > 0) {exit 0} else {exit 1}}'", + self.assertResourceCalled('Execute', '/usr/bin/kinit -kt /etc/security/keytabs/oozie.service.keytab oozie/c6402.ambari.apache....@example.com; hadoop --config /etc/hadoop/conf dfs -put /usr/lib/oozie/share /user/oozie ; hadoop --config /etc/hadoop/conf dfs -chmod -R 755 /user/oozie/share', + not_if = "/usr/bin/kinit -kt /etc/security/keytabs/oozie.service.keytab oozie/c6402.ambari.apache....@example.com; hadoop --config /etc/hadoop/conf dfs -ls /user/oozie/share | awk 'BEGIN {count=0;} /share/ {count++} END {if (count > 0) {exit 0} else {exit 1}}'", user = 'oozie', ) self.assertResourceCalled('Execute', 'cd /var/tmp/oozie && /usr/lib/oozie/bin/oozie-start.sh', @@ -122,6 +122,7 @@ class TestOozieServer(RMFTestCase): kinit_path_local = '/usr/bin/kinit', mode = 0775, owner = 'oozie', + bin_dir = '/usr/bin', action = ['create'], ) self.assertResourceCalled('XmlConfig', 'oozie-site.xml', @@ -224,6 +225,7 @@ class TestOozieServer(RMFTestCase): kinit_path_local = '/usr/bin/kinit', mode = 0775, owner = 'oozie', + bin_dir = '/usr/bin', action = ['create'], ) self.assertResourceCalled('XmlConfig', 'oozie-site.xml', http://git-wip-us.apache.org/repos/asf/ambari/blob/7d9feb6a/ambari-server/src/test/python/stacks/2.0.6/PIG/test_pig_service_check.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.0.6/PIG/test_pig_service_check.py b/ambari-server/src/test/python/stacks/2.0.6/PIG/test_pig_service_check.py index 1e1ad24..2521636 100644 --- a/ambari-server/src/test/python/stacks/2.0.6/PIG/test_pig_service_check.py +++ b/ambari-server/src/test/python/stacks/2.0.6/PIG/test_pig_service_check.py @@ -28,13 +28,14 @@ class TestPigServiceCheck(RMFTestCase): command = "service_check", config_file="default.json" ) - self.assertResourceCalled('ExecuteHadoop', 'dfs -rmr pigsmoke.out passwd; hadoop dfs -put /etc/passwd passwd ', + self.assertResourceCalled('ExecuteHadoop', 'dfs -rmr pigsmoke.out passwd; hadoop --config /etc/hadoop/conf dfs -put /etc/passwd passwd ', try_sleep = 5, tries = 3, user = 'ambari-qa', conf_dir = '/etc/hadoop/conf', security_enabled = False, keytab = UnknownConfigurationMock(), + bin_dir = '/usr/bin', kinit_path_local = '/usr/bin/kinit' ) @@ -44,7 +45,7 @@ class TestPigServiceCheck(RMFTestCase): ) self.assertResourceCalled('Execute', 'pig /tmp/pigSmoke.sh', - path = ['/usr/sbin:/sbin:/usr/local/bin:/bin:/usr/bin'], + path = [':/usr/sbin:/sbin:/usr/local/bin:/bin:/usr/bin'], tries = 3, user = 'ambari-qa', try_sleep = 5, @@ -52,6 +53,7 @@ class TestPigServiceCheck(RMFTestCase): self.assertResourceCalled('ExecuteHadoop', 'fs -test -e pigsmoke.out', user = 'ambari-qa', + bin_dir = '/usr/bin', conf_dir = '/etc/hadoop/conf', ) self.assertNoMoreResources() @@ -63,13 +65,14 @@ class TestPigServiceCheck(RMFTestCase): config_file="secured.json" ) - self.assertResourceCalled('ExecuteHadoop', 'dfs -rmr pigsmoke.out passwd; hadoop dfs -put /etc/passwd passwd ', + self.assertResourceCalled('ExecuteHadoop', 'dfs -rmr pigsmoke.out passwd; hadoop --config /etc/hadoop/conf dfs -put /etc/passwd passwd ', try_sleep = 5, tries = 3, user = 'ambari-qa', conf_dir = '/etc/hadoop/conf', security_enabled = True, keytab = '/etc/security/keytabs/smokeuser.headless.keytab', + bin_dir = '/usr/bin', kinit_path_local = '/usr/bin/kinit' ) @@ -79,7 +82,7 @@ class TestPigServiceCheck(RMFTestCase): ) self.assertResourceCalled('Execute', 'pig /tmp/pigSmoke.sh', - path = ['/usr/sbin:/sbin:/usr/local/bin:/bin:/usr/bin'], + path = [':/usr/sbin:/sbin:/usr/local/bin:/bin:/usr/bin'], tries = 3, user = 'ambari-qa', try_sleep = 5, @@ -87,6 +90,7 @@ class TestPigServiceCheck(RMFTestCase): self.assertResourceCalled('ExecuteHadoop', 'fs -test -e pigsmoke.out', user = 'ambari-qa', + bin_dir = '/usr/bin', conf_dir = '/etc/hadoop/conf', ) self.assertNoMoreResources() http://git-wip-us.apache.org/repos/asf/ambari/blob/7d9feb6a/ambari-server/src/test/python/stacks/2.0.6/WEBHCAT/test_webhcat_server.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.0.6/WEBHCAT/test_webhcat_server.py b/ambari-server/src/test/python/stacks/2.0.6/WEBHCAT/test_webhcat_server.py index 0e96b66..bde2e86 100644 --- a/ambari-server/src/test/python/stacks/2.0.6/WEBHCAT/test_webhcat_server.py +++ b/ambari-server/src/test/python/stacks/2.0.6/WEBHCAT/test_webhcat_server.py @@ -107,6 +107,7 @@ class TestWebHCatServer(RMFTestCase): kinit_path_local = "/usr/bin/kinit", mode = 0755, owner = 'hcat', + bin_dir = '/usr/bin', action = ['create_delayed'], ) self.assertResourceCalled('HdfsDirectory', '/user/hcat', @@ -117,6 +118,7 @@ class TestWebHCatServer(RMFTestCase): kinit_path_local = "/usr/bin/kinit", mode = 0755, owner = 'hcat', + bin_dir = '/usr/bin', action = ['create_delayed'], ) self.assertResourceCalled('HdfsDirectory', None, @@ -125,6 +127,7 @@ class TestWebHCatServer(RMFTestCase): conf_dir = '/etc/hadoop/conf', hdfs_user = 'hdfs', kinit_path_local = "/usr/bin/kinit", + bin_dir = '/usr/bin', action = ['create'], ) self.assertResourceCalled('Directory', '/var/run/webhcat', @@ -160,6 +163,7 @@ class TestWebHCatServer(RMFTestCase): mode=0755, dest_dir='/apps/webhcat', kinnit_if_needed='', + hadoop_conf_dir='/etc/hadoop/conf', hdfs_user='hdfs' ) self.assertResourceCalled('CopyFromLocal', '/usr/share/HDP-webhcat/pig.tar.gz', @@ -167,6 +171,7 @@ class TestWebHCatServer(RMFTestCase): mode=0755, dest_dir='/apps/webhcat', kinnit_if_needed='', + hadoop_conf_dir='/etc/hadoop/conf', hdfs_user='hdfs' ) self.assertResourceCalled('CopyFromLocal', '/usr/share/HDP-webhcat/hive.tar.gz', @@ -174,6 +179,7 @@ class TestWebHCatServer(RMFTestCase): mode=0755, dest_dir='/apps/webhcat', kinnit_if_needed='', + hadoop_conf_dir='/etc/hadoop/conf', hdfs_user='hdfs' ) @@ -186,6 +192,7 @@ class TestWebHCatServer(RMFTestCase): kinit_path_local = '/usr/bin/kinit', mode = 0755, owner = 'hcat', + bin_dir = '/usr/bin', action = ['create_delayed'], ) self.assertResourceCalled('HdfsDirectory', '/user/hcat', @@ -196,6 +203,7 @@ class TestWebHCatServer(RMFTestCase): kinit_path_local = '/usr/bin/kinit', mode = 0755, owner = 'hcat', + bin_dir = '/usr/bin', action = ['create_delayed'], ) self.assertResourceCalled('HdfsDirectory', None, @@ -204,6 +212,7 @@ class TestWebHCatServer(RMFTestCase): conf_dir = '/etc/hadoop/conf', hdfs_user = 'hdfs', kinit_path_local = '/usr/bin/kinit', + bin_dir = '/usr/bin', action = ['create'], ) self.assertResourceCalled('Directory', '/var/run/webhcat', @@ -243,6 +252,7 @@ class TestWebHCatServer(RMFTestCase): mode=0755, dest_dir='/apps/webhcat', kinnit_if_needed='/usr/bin/kinit -kt /etc/security/keytabs/hdfs.headless.keytab hdfs;', + hadoop_conf_dir='/etc/hadoop/conf', hdfs_user='hdfs' ) self.assertResourceCalled('CopyFromLocal', '/usr/share/HDP-webhcat/pig.tar.gz', @@ -250,6 +260,7 @@ class TestWebHCatServer(RMFTestCase): mode=0755, dest_dir='/apps/webhcat', kinnit_if_needed='/usr/bin/kinit -kt /etc/security/keytabs/hdfs.headless.keytab hdfs;', + hadoop_conf_dir='/etc/hadoop/conf', hdfs_user='hdfs' ) self.assertResourceCalled('CopyFromLocal', '/usr/share/HDP-webhcat/hive.tar.gz', @@ -257,5 +268,6 @@ class TestWebHCatServer(RMFTestCase): mode=0755, dest_dir='/apps/webhcat', kinnit_if_needed='/usr/bin/kinit -kt /etc/security/keytabs/hdfs.headless.keytab hdfs;', + hadoop_conf_dir='/etc/hadoop/conf', hdfs_user='hdfs' ) \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ambari/blob/7d9feb6a/ambari-server/src/test/python/stacks/2.0.6/YARN/test_historyserver.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.0.6/YARN/test_historyserver.py b/ambari-server/src/test/python/stacks/2.0.6/YARN/test_historyserver.py index 155e07d..738ffc1 100644 --- a/ambari-server/src/test/python/stacks/2.0.6/YARN/test_historyserver.py +++ b/ambari-server/src/test/python/stacks/2.0.6/YARN/test_historyserver.py @@ -124,6 +124,7 @@ class TestHistoryServer(RMFTestCase): group = 'hadoop', action = ['create_delayed'], mode = 0777, + bin_dir = '/usr/bin' ) self.assertResourceCalled('HdfsDirectory', '/mapred', security_enabled = False, @@ -132,6 +133,7 @@ class TestHistoryServer(RMFTestCase): hdfs_user = 'hdfs', kinit_path_local = "/usr/bin/kinit", owner = 'mapred', + bin_dir = '/usr/bin', action = ['create_delayed'], ) self.assertResourceCalled('HdfsDirectory', '/mapred/system', @@ -141,6 +143,7 @@ class TestHistoryServer(RMFTestCase): hdfs_user = 'hdfs', kinit_path_local = "/usr/bin/kinit", owner = 'hdfs', + bin_dir = '/usr/bin', action = ['create_delayed'], ) self.assertResourceCalled('HdfsDirectory', '/mr-history/tmp', @@ -152,6 +155,7 @@ class TestHistoryServer(RMFTestCase): mode = 0777, owner = 'mapred', group = 'hadoop', + bin_dir = '/usr/bin', action = ['create_delayed'], ) self.assertResourceCalled('HdfsDirectory', '/mr-history/done', @@ -163,6 +167,7 @@ class TestHistoryServer(RMFTestCase): mode = 01777, owner = 'mapred', group = 'hadoop', + bin_dir = '/usr/bin', action = ['create_delayed'], ) self.assertResourceCalled('HdfsDirectory', None, @@ -171,6 +176,7 @@ class TestHistoryServer(RMFTestCase): conf_dir = '/etc/hadoop/conf', hdfs_user = 'hdfs', kinit_path_local = "/usr/bin/kinit", + bin_dir = '/usr/bin', action = ['create'], ) self.assertResourceCalled('Directory', '/var/run/hadoop-yarn/yarn', @@ -314,6 +320,7 @@ class TestHistoryServer(RMFTestCase): owner = 'yarn', group = 'hadoop', action = ['create_delayed'], + bin_dir = '/usr/bin', mode = 0777, ) self.assertResourceCalled('HdfsDirectory', '/mapred', @@ -323,6 +330,7 @@ class TestHistoryServer(RMFTestCase): hdfs_user = 'hdfs', kinit_path_local = '/usr/bin/kinit', owner = 'mapred', + bin_dir = '/usr/bin', action = ['create_delayed'], ) self.assertResourceCalled('HdfsDirectory', '/mapred/system', @@ -332,6 +340,7 @@ class TestHistoryServer(RMFTestCase): hdfs_user = 'hdfs', kinit_path_local = '/usr/bin/kinit', owner = 'hdfs', + bin_dir = '/usr/bin', action = ['create_delayed'], ) self.assertResourceCalled('HdfsDirectory', '/mr-history/tmp', @@ -343,6 +352,7 @@ class TestHistoryServer(RMFTestCase): mode = 0777, owner = 'mapred', group = 'hadoop', + bin_dir = '/usr/bin', action = ['create_delayed'], ) self.assertResourceCalled('HdfsDirectory', '/mr-history/done', @@ -354,6 +364,7 @@ class TestHistoryServer(RMFTestCase): mode = 01777, owner = 'mapred', group = 'hadoop', + bin_dir = '/usr/bin', action = ['create_delayed'], ) self.assertResourceCalled('HdfsDirectory', None, @@ -362,6 +373,7 @@ class TestHistoryServer(RMFTestCase): conf_dir = '/etc/hadoop/conf', hdfs_user = 'hdfs', kinit_path_local = '/usr/bin/kinit', + bin_dir = '/usr/bin', action = ['create'], ) self.assertResourceCalled('Directory', '/var/run/hadoop-yarn/yarn', http://git-wip-us.apache.org/repos/asf/ambari/blob/7d9feb6a/ambari-server/src/test/python/stacks/2.0.6/YARN/test_nodemanager.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.0.6/YARN/test_nodemanager.py b/ambari-server/src/test/python/stacks/2.0.6/YARN/test_nodemanager.py index 4723b0f..5f15d91 100644 --- a/ambari-server/src/test/python/stacks/2.0.6/YARN/test_nodemanager.py +++ b/ambari-server/src/test/python/stacks/2.0.6/YARN/test_nodemanager.py @@ -120,6 +120,7 @@ class TestNodeManager(RMFTestCase): owner = 'yarn', group = 'hadoop', action = ['create_delayed'], + bin_dir = '/usr/bin', mode = 0777, ) self.assertResourceCalled('HdfsDirectory', '/mapred', @@ -129,6 +130,7 @@ class TestNodeManager(RMFTestCase): hdfs_user = 'hdfs', kinit_path_local = "/usr/bin/kinit", owner = 'mapred', + bin_dir = '/usr/bin', action = ['create_delayed'], ) self.assertResourceCalled('HdfsDirectory', '/mapred/system', @@ -138,6 +140,7 @@ class TestNodeManager(RMFTestCase): hdfs_user = 'hdfs', kinit_path_local = "/usr/bin/kinit", owner = 'hdfs', + bin_dir = '/usr/bin', action = ['create_delayed'], ) self.assertResourceCalled('HdfsDirectory', '/mr-history/tmp', @@ -149,6 +152,7 @@ class TestNodeManager(RMFTestCase): mode = 0777, owner = 'mapred', group = 'hadoop', + bin_dir = '/usr/bin', action = ['create_delayed'], ) self.assertResourceCalled('HdfsDirectory', '/mr-history/done', @@ -160,6 +164,7 @@ class TestNodeManager(RMFTestCase): mode = 01777, owner = 'mapred', group = 'hadoop', + bin_dir = '/usr/bin', action = ['create_delayed'], ) self.assertResourceCalled('HdfsDirectory', None, @@ -168,6 +173,7 @@ class TestNodeManager(RMFTestCase): conf_dir = '/etc/hadoop/conf', hdfs_user = 'hdfs', kinit_path_local = "/usr/bin/kinit", + bin_dir = '/usr/bin', action = ['create'], ) self.assertResourceCalled('Directory', '/var/run/hadoop-yarn/yarn', @@ -311,6 +317,7 @@ class TestNodeManager(RMFTestCase): owner = 'yarn', group = 'hadoop', action = ['create_delayed'], + bin_dir = '/usr/bin', mode = 0777, ) self.assertResourceCalled('HdfsDirectory', '/mapred', @@ -320,6 +327,7 @@ class TestNodeManager(RMFTestCase): hdfs_user = 'hdfs', kinit_path_local = '/usr/bin/kinit', owner = 'mapred', + bin_dir = '/usr/bin', action = ['create_delayed'], ) self.assertResourceCalled('HdfsDirectory', '/mapred/system', @@ -329,6 +337,7 @@ class TestNodeManager(RMFTestCase): hdfs_user = 'hdfs', kinit_path_local = '/usr/bin/kinit', owner = 'hdfs', + bin_dir = '/usr/bin', action = ['create_delayed'], ) self.assertResourceCalled('HdfsDirectory', '/mr-history/tmp', @@ -338,6 +347,7 @@ class TestNodeManager(RMFTestCase): hdfs_user = 'hdfs', kinit_path_local = '/usr/bin/kinit', mode = 0777, + bin_dir = '/usr/bin', owner = 'mapred', group = 'hadoop', action = ['create_delayed'], @@ -349,6 +359,7 @@ class TestNodeManager(RMFTestCase): hdfs_user = 'hdfs', kinit_path_local = '/usr/bin/kinit', mode = 01777, + bin_dir = '/usr/bin', owner = 'mapred', group = 'hadoop', action = ['create_delayed'], @@ -357,6 +368,7 @@ class TestNodeManager(RMFTestCase): security_enabled = True, keytab = '/etc/security/keytabs/hdfs.headless.keytab', conf_dir = '/etc/hadoop/conf', + bin_dir = '/usr/bin', hdfs_user = 'hdfs', kinit_path_local = '/usr/bin/kinit', action = ['create'], http://git-wip-us.apache.org/repos/asf/ambari/blob/7d9feb6a/ambari-server/src/test/python/stacks/2.0.6/YARN/test_yarn_service_check.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.0.6/YARN/test_yarn_service_check.py b/ambari-server/src/test/python/stacks/2.0.6/YARN/test_yarn_service_check.py index 7c4c01a..65ea0a5 100644 --- a/ambari-server/src/test/python/stacks/2.0.6/YARN/test_yarn_service_check.py +++ b/ambari-server/src/test/python/stacks/2.0.6/YARN/test_yarn_service_check.py @@ -17,6 +17,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ''' +import os from mock.mock import MagicMock, call, patch from stacks.utils.RMFTestCase import * @@ -41,8 +42,9 @@ class TestServiceCheck(RMFTestCase): user = 'ambari-qa', try_sleep = 5, ) - self.assertResourceCalled('Execute', '/usr/bin/yarn node -list', - user = 'ambari-qa', + self.assertResourceCalled('Execute', 'yarn --config /etc/hadoop/conf node -list', + environment = {'PATH' : os.environ['PATH'] + os.pathsep + "/usr/bin"}, + user = 'ambari-qa', ) self.assertNoMoreResources() @@ -63,7 +65,8 @@ class TestServiceCheck(RMFTestCase): user = 'ambari-qa', try_sleep = 5, ) - self.assertResourceCalled('Execute', '/usr/bin/yarn node -list', + self.assertResourceCalled('Execute', 'yarn --config /etc/hadoop/conf node -list', + environment = {'PATH' : os.environ['PATH'] + os.pathsep + "/usr/bin"}, user = 'ambari-qa', ) self.assertNoMoreResources() http://git-wip-us.apache.org/repos/asf/ambari/blob/7d9feb6a/ambari-server/src/test/python/stacks/2.1/FALCON/test_falcon_server.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.1/FALCON/test_falcon_server.py b/ambari-server/src/test/python/stacks/2.1/FALCON/test_falcon_server.py index 93ea2d1..2282dcc 100644 --- a/ambari-server/src/test/python/stacks/2.1/FALCON/test_falcon_server.py +++ b/ambari-server/src/test/python/stacks/2.1/FALCON/test_falcon_server.py @@ -94,6 +94,7 @@ class TestFalconServer(RMFTestCase): kinit_path_local = '/usr/bin/kinit', mode = 0777, owner = 'falcon', + bin_dir = '/usr/bin', action = ['create_delayed'], ) self.assertResourceCalled('HdfsDirectory', None, @@ -102,6 +103,7 @@ class TestFalconServer(RMFTestCase): conf_dir = '/etc/hadoop/conf', hdfs_user = 'hdfs', kinit_path_local = '/usr/bin/kinit', + bin_dir = '/usr/bin', action = ['create'], ) self.assertResourceCalled('Directory', '/hadoop/falcon', http://git-wip-us.apache.org/repos/asf/ambari/blob/7d9feb6a/ambari-server/src/test/python/stacks/2.1/HIVE/test_hive_metastore.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.1/HIVE/test_hive_metastore.py b/ambari-server/src/test/python/stacks/2.1/HIVE/test_hive_metastore.py index 77909a7..47423ff 100644 --- a/ambari-server/src/test/python/stacks/2.1/HIVE/test_hive_metastore.py +++ b/ambari-server/src/test/python/stacks/2.1/HIVE/test_hive_metastore.py @@ -17,6 +17,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ''' +import os from mock.mock import MagicMock, call, patch from stacks.utils.RMFTestCase import * @@ -40,6 +41,8 @@ class TestHiveMetastore(RMFTestCase): self.assert_configure_default() self.assertResourceCalled('Execute', 'env HADOOP_HOME=/usr JAVA_HOME=/usr/jdk64/jdk1.7.0_45 /tmp/start_metastore_script /var/log/hive/hive.out /var/log/hive/hive.log /var/run/hive/hive.pid /etc/hive/conf.server /var/log/hive', not_if = 'ls /var/run/hive/hive.pid >/dev/null 2>&1 && ps `cat /var/run/hive/hive.pid` >/dev/null 2>&1', + environment = {'PATH' : os.environ['PATH'] + os.pathsep + "/usr/lib/hive/bin", + 'HADOOP_HOME' : '/usr'}, user = 'hive' ) @@ -82,6 +85,8 @@ class TestHiveMetastore(RMFTestCase): self.assert_configure_secured() self.assertResourceCalled('Execute', 'env HADOOP_HOME=/usr JAVA_HOME=/usr/jdk64/jdk1.7.0_45 /tmp/start_metastore_script /var/log/hive/hive.out /var/log/hive/hive.log /var/run/hive/hive.pid /etc/hive/conf.server /var/log/hive', not_if = 'ls /var/run/hive/hive.pid >/dev/null 2>&1 && ps `cat /var/run/hive/hive.pid` >/dev/null 2>&1', + environment = {'PATH' : os.environ['PATH'] + os.pathsep + "/usr/lib/hive/bin", + 'HADOOP_HOME' : '/usr'}, user = 'hive' ) @@ -175,6 +180,7 @@ class TestHiveMetastore(RMFTestCase): self.assertResourceCalled('Execute', 'hive mkdir -p /tmp/AMBARI-artifacts/ ; cp /usr/share/java/mysql-connector-java.jar /usr/lib/hive/lib//mysql-connector-java.jar', creates = '/usr/lib/hive/lib//mysql-connector-java.jar', path = ['/bin', '/usr/bin/'], + environment = {'PATH' : os.environ['PATH'] + os.pathsep + "/usr/lib/hive/bin"}, not_if = 'test -f /usr/lib/hive/lib//mysql-connector-java.jar', ) self.assertResourceCalled('Execute', '/bin/sh -c \'cd /usr/lib/ambari-agent/ && curl -kf -x "" --retry 5 http://c6401.ambari.apache.org:8080/resources/DBConnectionVerification.jar -o DBConnectionVerification.jar\'', @@ -279,6 +285,7 @@ class TestHiveMetastore(RMFTestCase): self.assertResourceCalled('Execute', 'hive mkdir -p /tmp/AMBARI-artifacts/ ; cp /usr/share/java/mysql-connector-java.jar /usr/lib/hive/lib//mysql-connector-java.jar', creates = '/usr/lib/hive/lib//mysql-connector-java.jar', path = ['/bin', '/usr/bin/'], + environment = {'PATH' : os.environ['PATH'] + os.pathsep + "/usr/lib/hive/bin"}, not_if = 'test -f /usr/lib/hive/lib//mysql-connector-java.jar', ) self.assertResourceCalled('Execute', '/bin/sh -c \'cd /usr/lib/ambari-agent/ && curl -kf -x "" --retry 5 http://c6401.ambari.apache.org:8080/resources/DBConnectionVerification.jar -o DBConnectionVerification.jar\'',