Return-Path: X-Original-To: apmail-ambari-commits-archive@www.apache.org Delivered-To: apmail-ambari-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 9EA6A1017E for ; Tue, 9 Dec 2014 18:43:41 +0000 (UTC) Received: (qmail 64560 invoked by uid 500); 9 Dec 2014 18:43:41 -0000 Delivered-To: apmail-ambari-commits-archive@ambari.apache.org Received: (qmail 64523 invoked by uid 500); 9 Dec 2014 18:43:41 -0000 Mailing-List: contact commits-help@ambari.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: ambari-dev@ambari.apache.org Delivered-To: mailing list commits@ambari.apache.org Received: (qmail 64514 invoked by uid 99); 9 Dec 2014 18:43:41 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 09 Dec 2014 18:43:41 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 3A01FA21439; Tue, 9 Dec 2014 18:43:41 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: aonishuk@apache.org To: commits@ambari.apache.org Date: Tue, 09 Dec 2014 18:43:41 -0000 Message-Id: <44cb05bb401d4d61a50d8a2345a8051c@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [1/2] ambari git commit: AMBARI-8614. Run services as sudo on HDP2 (aonishuk) Repository: ambari Updated Branches: refs/heads/trunk 45468b65a -> 6ed4fe450 http://git-wip-us.apache.org/repos/asf/ambari/blob/6ed4fe45/ambari-server/src/test/python/stacks/1.3.2/OOZIE/test_oozie_server.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/1.3.2/OOZIE/test_oozie_server.py b/ambari-server/src/test/python/stacks/1.3.2/OOZIE/test_oozie_server.py index 0cabe63..7a0a8cc 100644 --- a/ambari-server/src/test/python/stacks/1.3.2/OOZIE/test_oozie_server.py +++ b/ambari-server/src/test/python/stacks/1.3.2/OOZIE/test_oozie_server.py @@ -114,18 +114,16 @@ class TestOozieServer(RMFTestCase): recursive = True, mode = 0755, ) - self.assertResourceCalled('Execute', 'cd /usr/lib/oozie && tar -xvf oozie-sharelib.tar.gz', - not_if = 'ls /var/run/oozie/oozie.pid >/dev/null 2>&1 && ps -p `cat /var/run/oozie/oozie.pid` >/dev/null 2>&1', - ) - self.assertResourceCalled('Execute', 'cd /usr/lib/oozie && mkdir -p /var/tmp/oozie', - not_if = 'ls /var/run/oozie/oozie.pid >/dev/null 2>&1 && ps -p `cat /var/run/oozie/oozie.pid` >/dev/null 2>&1', + self.assertResourceCalled('Directory', '/usr/lib/oozie/libext', + recursive = True, ) - self.assertResourceCalled('Execute', 'cd /usr/lib/oozie && chown oozie:hadoop /var/tmp/oozie', - not_if = 'ls /var/run/oozie/oozie.pid >/dev/null 2>&1 && ps -p `cat /var/run/oozie/oozie.pid` >/dev/null 2>&1', + self.assertResourceCalled('Execute', ('tar', '-xvf', '/usr/lib/oozie/oozie-sharelib.tar.gz', '-C', '/usr/lib/oozie'), + not_if = 'ls /var/run/oozie/oozie.pid >/dev/null 2>&1 && ps -p `cat /var/run/oozie/oozie.pid` >/dev/null 2>&1', + sudo = True, ) self.assertResourceCalled('Execute', 'cd /var/tmp/oozie && /usr/lib/oozie/bin/oozie-setup.sh -hadoop 0.20.200 /usr/lib/hadoop/ -extjs /usr/share/HDP-oozie/ext.zip -jars `LZO_JARS=($(find /usr/lib/hadoop/lib/ -name "hadoop-lzo-*")); echo ${LZO_JARS[0]}`:', - not_if = 'ls /var/run/oozie/oozie.pid >/dev/null 2>&1 && ps -p `cat /var/run/oozie/oozie.pid` >/dev/null 2>&1', - user = 'oozie', + not_if = 'ls /var/run/oozie/oozie.pid >/dev/null 2>&1 && ps -p `cat /var/run/oozie/oozie.pid` >/dev/null 2>&1', + user = 'oozie', ) self.assertNoMoreResources() @@ -160,8 +158,12 @@ class TestOozieServer(RMFTestCase): command = "stop", config_file="default.json" ) - self.assertResourceCalled('Execute', "su -s /bin/bash - oozie -c 'cd /var/tmp/oozie && /usr/lib/oozie/bin/oozie-stop.sh' && rm -f /var/run/oozie/oozie.pid", - only_if = 'ls /var/run/oozie/oozie.pid >/dev/null 2>&1 && ps -p `cat /var/run/oozie/oozie.pid` >/dev/null 2>&1', + self.assertResourceCalled('Execute', 'cd /var/tmp/oozie && /usr/lib/oozie/bin/oozie-stop.sh', + only_if = 'ls /var/run/oozie/oozie.pid >/dev/null 2>&1 && ps -p `cat /var/run/oozie/oozie.pid` >/dev/null 2>&1', + user = 'oozie', + ) + self.assertResourceCalled('File', '/var/run/oozie/oozie.pid', + action = ['delete'], ) self.assertNoMoreResources() @@ -258,18 +260,16 @@ class TestOozieServer(RMFTestCase): recursive = True, mode = 0755, ) - self.assertResourceCalled('Execute', 'cd /usr/lib/oozie && tar -xvf oozie-sharelib.tar.gz', - not_if = 'ls /var/run/oozie/oozie.pid >/dev/null 2>&1 && ps -p `cat /var/run/oozie/oozie.pid` >/dev/null 2>&1', + self.assertResourceCalled('Directory', '/usr/lib/oozie/libext', + recursive = True, ) - self.assertResourceCalled('Execute', 'cd /usr/lib/oozie && mkdir -p /var/tmp/oozie', - not_if = 'ls /var/run/oozie/oozie.pid >/dev/null 2>&1 && ps -p `cat /var/run/oozie/oozie.pid` >/dev/null 2>&1', - ) - self.assertResourceCalled('Execute', 'cd /usr/lib/oozie && chown oozie:hadoop /var/tmp/oozie', - not_if = 'ls /var/run/oozie/oozie.pid >/dev/null 2>&1 && ps -p `cat /var/run/oozie/oozie.pid` >/dev/null 2>&1', + self.assertResourceCalled('Execute', ('tar', '-xvf', '/usr/lib/oozie/oozie-sharelib.tar.gz', '-C', '/usr/lib/oozie'), + not_if = 'ls /var/run/oozie/oozie.pid >/dev/null 2>&1 && ps -p `cat /var/run/oozie/oozie.pid` >/dev/null 2>&1', + sudo = True, ) self.assertResourceCalled('Execute', 'cd /var/tmp/oozie && /usr/lib/oozie/bin/oozie-setup.sh -hadoop 0.20.200 /usr/lib/hadoop/ -extjs /usr/share/HDP-oozie/ext.zip -jars `LZO_JARS=($(find /usr/lib/hadoop/lib/ -name "hadoop-lzo-*")); echo ${LZO_JARS[0]}`:', - not_if = 'ls /var/run/oozie/oozie.pid >/dev/null 2>&1 && ps -p `cat /var/run/oozie/oozie.pid` >/dev/null 2>&1', - user = 'oozie', + not_if = 'ls /var/run/oozie/oozie.pid >/dev/null 2>&1 && ps -p `cat /var/run/oozie/oozie.pid` >/dev/null 2>&1', + user = 'oozie', ) self.assertNoMoreResources() @@ -303,8 +303,12 @@ class TestOozieServer(RMFTestCase): command = "stop", config_file="secured.json" ) - self.assertResourceCalled('Execute', "su -s /bin/bash - oozie -c 'cd /var/tmp/oozie && /usr/lib/oozie/bin/oozie-stop.sh' && rm -f /var/run/oozie/oozie.pid", - only_if = 'ls /var/run/oozie/oozie.pid >/dev/null 2>&1 && ps -p `cat /var/run/oozie/oozie.pid` >/dev/null 2>&1', + self.assertResourceCalled('Execute', 'cd /var/tmp/oozie && /usr/lib/oozie/bin/oozie-stop.sh', + only_if = 'ls /var/run/oozie/oozie.pid >/dev/null 2>&1 && ps -p `cat /var/run/oozie/oozie.pid` >/dev/null 2>&1', + user = 'oozie', + ) + self.assertResourceCalled('File', '/var/run/oozie/oozie.pid', + action = ['delete'], ) self.assertNoMoreResources() @@ -395,19 +399,17 @@ class TestOozieServer(RMFTestCase): recursive = True, mode = 0755, ) - self.assertResourceCalled('Execute', 'cd /usr/lib/oozie && tar -xvf oozie-sharelib.tar.gz', - not_if = 'ls /var/run/oozie/oozie.pid >/dev/null 2>&1 && ps -p `cat /var/run/oozie/oozie.pid` >/dev/null 2>&1', - ) - self.assertResourceCalled('Execute', 'cd /usr/lib/oozie && mkdir -p /var/tmp/oozie', - not_if = 'ls /var/run/oozie/oozie.pid >/dev/null 2>&1 && ps -p `cat /var/run/oozie/oozie.pid` >/dev/null 2>&1', - ) - self.assertResourceCalled('Execute', 'cd /usr/lib/oozie && chown oozie:hadoop /var/tmp/oozie', - not_if = 'ls /var/run/oozie/oozie.pid >/dev/null 2>&1 && ps -p `cat /var/run/oozie/oozie.pid` >/dev/null 2>&1', - ) + self.assertResourceCalled('Directory', '/usr/lib/oozie/libext', + recursive = True, + ) + self.assertResourceCalled('Execute', ('tar', '-xvf', '/usr/lib/oozie/oozie-sharelib.tar.gz', '-C', '/usr/lib/oozie'), + not_if = 'ls /var/run/oozie/oozie.pid >/dev/null 2>&1 && ps -p `cat /var/run/oozie/oozie.pid` >/dev/null 2>&1', + sudo = True, + ) self.assertResourceCalled('Execute', 'cd /var/tmp/oozie && /usr/lib/oozie/bin/oozie-setup.sh -hadoop 0.20.200 /usr/lib/hadoop/ -extjs /usr/share/HDP-oozie/ext.zip -jars `LZO_JARS=($(find /usr/lib/hadoop/lib/ -name "hadoop-lzo-*")); echo ${LZO_JARS[0]}`:', - not_if = 'ls /var/run/oozie/oozie.pid >/dev/null 2>&1 && ps -p `cat /var/run/oozie/oozie.pid` >/dev/null 2>&1', - user = 'oozie', - ) + not_if = 'ls /var/run/oozie/oozie.pid >/dev/null 2>&1 && ps -p `cat /var/run/oozie/oozie.pid` >/dev/null 2>&1', + user = 'oozie', + ) def configure_secured(self): self.assertResourceCalled('HdfsDirectory', '/user/oozie', @@ -496,16 +498,14 @@ class TestOozieServer(RMFTestCase): recursive = True, mode = 0755, ) - self.assertResourceCalled('Execute', 'cd /usr/lib/oozie && tar -xvf oozie-sharelib.tar.gz', - not_if = 'ls /var/run/oozie/oozie.pid >/dev/null 2>&1 && ps -p `cat /var/run/oozie/oozie.pid` >/dev/null 2>&1', - ) - self.assertResourceCalled('Execute', 'cd /usr/lib/oozie && mkdir -p /var/tmp/oozie', - not_if = 'ls /var/run/oozie/oozie.pid >/dev/null 2>&1 && ps -p `cat /var/run/oozie/oozie.pid` >/dev/null 2>&1', - ) - self.assertResourceCalled('Execute', 'cd /usr/lib/oozie && chown oozie:hadoop /var/tmp/oozie', - not_if = 'ls /var/run/oozie/oozie.pid >/dev/null 2>&1 && ps -p `cat /var/run/oozie/oozie.pid` >/dev/null 2>&1', - ) + self.assertResourceCalled('Directory', '/usr/lib/oozie/libext', + recursive = True, + ) + self.assertResourceCalled('Execute', ('tar', '-xvf', '/usr/lib/oozie/oozie-sharelib.tar.gz', '-C', '/usr/lib/oozie'), + not_if = 'ls /var/run/oozie/oozie.pid >/dev/null 2>&1 && ps -p `cat /var/run/oozie/oozie.pid` >/dev/null 2>&1', + sudo = True, + ) self.assertResourceCalled('Execute', 'cd /var/tmp/oozie && /usr/lib/oozie/bin/oozie-setup.sh -hadoop 0.20.200 /usr/lib/hadoop/ -extjs /usr/share/HDP-oozie/ext.zip -jars `LZO_JARS=($(find /usr/lib/hadoop/lib/ -name "hadoop-lzo-*")); echo ${LZO_JARS[0]}`:', - not_if = 'ls /var/run/oozie/oozie.pid >/dev/null 2>&1 && ps -p `cat /var/run/oozie/oozie.pid` >/dev/null 2>&1', - user = 'oozie', - ) \ No newline at end of file + not_if = 'ls /var/run/oozie/oozie.pid >/dev/null 2>&1 && ps -p `cat /var/run/oozie/oozie.pid` >/dev/null 2>&1', + user = 'oozie', + ) \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ambari/blob/6ed4fe45/ambari-server/src/test/python/stacks/2.0.6/FLUME/test_flume.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.0.6/FLUME/test_flume.py b/ambari-server/src/test/python/stacks/2.0.6/FLUME/test_flume.py index d7b3537..65d8656 100644 --- a/ambari-server/src/test/python/stacks/2.0.6/FLUME/test_flume.py +++ b/ambari-server/src/test/python/stacks/2.0.6/FLUME/test_flume.py @@ -51,14 +51,11 @@ class TestFlumeHandler(RMFTestCase): self.assertTrue(set_desired_mock.called) self.assertTrue(set_desired_mock.call_args[0][0] == 'STARTED') - self.assertResourceCalled('Execute', format('su -s /bin/bash flume -c "export JAVA_HOME=/usr/jdk64/jdk1.7.0_45; /usr/bin/flume-ng agent ' - '--name a1 ' - '--conf /etc/flume/conf/a1 ' - '--conf-file /etc/flume/conf/a1/flume.conf ' - '-Dflume.monitoring.type=ganglia ' - '-Dflume.monitoring.hosts=c6401.ambari.apache.org:8655" &'), - wait_for_finish = False) + self.assertResourceCalled('Execute', "/usr/bin/sudo su flume -l -s /bin/bash -c 'export JAVA_HOME=/usr/jdk64/jdk1.7.0_45 > /dev/null ; /usr/bin/flume-ng agent --name a1 --conf /etc/flume/conf/a1 --conf-file /etc/flume/conf/a1/flume.conf -Dflume.monitoring.type=ganglia -Dflume.monitoring.hosts=c6401.ambari.apache.org:8655' &", + environment = {'JAVA_HOME': u'/usr/jdk64/jdk1.7.0_45'}, + wait_for_finish = False, + ) self.assertResourceCalled('Execute', 'pgrep -o -u flume -f ^/usr/jdk64/jdk1.7.0_45.*a1.* > /var/run/flume/a1.pid', logoutput = True, tries = 20, @@ -266,13 +263,11 @@ class TestFlumeHandler(RMFTestCase): self.assert_configure_many() - self.assertResourceCalled('Execute', format('su -s /bin/bash flume -c "export JAVA_HOME=/usr/jdk64/jdk1.7.0_45; /usr/bin/flume-ng agent ' - '--name b1 ' - '--conf /etc/flume/conf/b1 ' - '--conf-file /etc/flume/conf/b1/flume.conf ' - '-Dflume.monitoring.type=ganglia ' - '-Dflume.monitoring.hosts=c6401.ambari.apache.org:8655" &'), - wait_for_finish = False) + + self.assertResourceCalled('Execute', "/usr/bin/sudo su flume -l -s /bin/bash -c 'export JAVA_HOME=/usr/jdk64/jdk1.7.0_45 > /dev/null ; /usr/bin/flume-ng agent --name b1 --conf /etc/flume/conf/b1 --conf-file /etc/flume/conf/b1/flume.conf -Dflume.monitoring.type=ganglia -Dflume.monitoring.hosts=c6401.ambari.apache.org:8655' &", + environment = {'JAVA_HOME': u'/usr/jdk64/jdk1.7.0_45'}, + wait_for_finish = False, + ) self.assertResourceCalled('Execute', 'pgrep -o -u flume -f ^/usr/jdk64/jdk1.7.0_45.*b1.* > /var/run/flume/b1.pid', logoutput = True, http://git-wip-us.apache.org/repos/asf/ambari/blob/6ed4fe45/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 7a87493..a2d0443 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 @@ -59,8 +59,11 @@ class TestHiveMetastore(RMFTestCase): config_file="default.json" ) - self.assertResourceCalled('Execute', 'kill `cat /var/run/hive/hive.pid` >/dev/null 2>&1 && rm -f /var/run/hive/hive.pid', - not_if = '! (ls /var/run/hive/hive.pid >/dev/null 2>&1 && ps -p `cat /var/run/hive/hive.pid` >/dev/null 2>&1)' + self.assertResourceCalled('Execute', 'sudo kill `cat /var/run/hive/hive.pid`', + not_if = '! (ls /var/run/hive/hive.pid >/dev/null 2>&1 && ps -p `cat /var/run/hive/hive.pid` >/dev/null 2>&1)', + ) + self.assertResourceCalled('File', '/var/run/hive/hive.pid', + action = ['delete'], ) self.assertNoMoreResources() @@ -101,8 +104,11 @@ class TestHiveMetastore(RMFTestCase): config_file="secured.json" ) - self.assertResourceCalled('Execute', 'kill `cat /var/run/hive/hive.pid` >/dev/null 2>&1 && rm -f /var/run/hive/hive.pid', - not_if = '! (ls /var/run/hive/hive.pid >/dev/null 2>&1 && ps -p `cat /var/run/hive/hive.pid` >/dev/null 2>&1)' + self.assertResourceCalled('Execute', 'sudo kill `cat /var/run/hive/hive.pid`', + not_if = '! (ls /var/run/hive/hive.pid >/dev/null 2>&1 && ps -p `cat /var/run/hive/hive.pid` >/dev/null 2>&1)', + ) + self.assertResourceCalled('File', '/var/run/hive/hive.pid', + action = ['delete'], ) self.assertNoMoreResources() @@ -189,10 +195,15 @@ class TestHiveMetastore(RMFTestCase): owner = 'hive', group = 'hadoop', ) - self.assertResourceCalled('Execute', 'hive mkdir -p /tmp/AMBARI-artifacts/ ; rm -f /usr/lib/hive/lib//mysql-connector-java.jar ; cp /usr/share/java/mysql-connector-java.jar /usr/lib/hive/lib//mysql-connector-java.jar', + self.assertResourceCalled('File', '/usr/lib/hive/lib//mysql-connector-java.jar', + action = ['delete'], + ) + self.assertResourceCalled('Execute', ('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" + os.pathsep + "/usr/bin"}, path = ['/bin', '/usr/bin/'], + sudo = True, 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\'', @@ -305,10 +316,15 @@ class TestHiveMetastore(RMFTestCase): owner = 'hive', group = 'hadoop', ) - self.assertResourceCalled('Execute', 'hive mkdir -p /tmp/AMBARI-artifacts/ ; rm -f /usr/lib/hive/lib//mysql-connector-java.jar ; cp /usr/share/java/mysql-connector-java.jar /usr/lib/hive/lib//mysql-connector-java.jar', + self.assertResourceCalled('File', '/usr/lib/hive/lib//mysql-connector-java.jar', + action = ['delete'], + ) + self.assertResourceCalled('Execute', ('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" + os.pathsep + "/usr/bin"}, + sudo = True, 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/6ed4fe45/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 c86059e..d0ba749 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 @@ -77,8 +77,11 @@ class TestHiveServer(RMFTestCase): config_file="default.json" ) - self.assertResourceCalled('Execute', 'kill `cat /var/run/hive/hive-server.pid` >/dev/null 2>&1 && rm -f /var/run/hive/hive-server.pid', - not_if = '! (ls /var/run/hive/hive-server.pid >/dev/null 2>&1 && ps -p `cat /var/run/hive/hive-server.pid` >/dev/null 2>&1)' + self.assertResourceCalled('Execute', 'sudo kill `cat /var/run/hive/hive-server.pid`', + not_if = '! (ls /var/run/hive/hive-server.pid >/dev/null 2>&1 && ps -p `cat /var/run/hive/hive-server.pid` >/dev/null 2>&1)', + ) + self.assertResourceCalled('File', '/var/run/hive/hive-server.pid', + action = ['delete'], ) self.assertNoMoreResources() @@ -135,8 +138,11 @@ class TestHiveServer(RMFTestCase): config_file="secured.json" ) - self.assertResourceCalled('Execute', 'kill `cat /var/run/hive/hive-server.pid` >/dev/null 2>&1 && rm -f /var/run/hive/hive-server.pid', - not_if = '! (ls /var/run/hive/hive-server.pid >/dev/null 2>&1 && ps -p `cat /var/run/hive/hive-server.pid` >/dev/null 2>&1)' + self.assertResourceCalled('Execute', 'sudo kill `cat /var/run/hive/hive-server.pid`', + not_if = '! (ls /var/run/hive/hive-server.pid >/dev/null 2>&1 && ps -p `cat /var/run/hive/hive-server.pid` >/dev/null 2>&1)', + ) + self.assertResourceCalled('File', '/var/run/hive/hive-server.pid', + action = ['delete'], ) self.assertNoMoreResources() @@ -309,10 +315,15 @@ class TestHiveServer(RMFTestCase): owner = 'hive', group = 'hadoop', ) - self.assertResourceCalled('Execute', 'hive mkdir -p /tmp/AMBARI-artifacts/ ; rm -f /usr/lib/hive/lib//mysql-connector-java.jar ; cp /usr/share/java/mysql-connector-java.jar /usr/lib/hive/lib//mysql-connector-java.jar', + self.assertResourceCalled('File', '/usr/lib/hive/lib//mysql-connector-java.jar', + action = ['delete'], + ) + self.assertResourceCalled('Execute', ('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" + os.pathsep + "/usr/bin"}, + sudo = True, 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\'', @@ -456,10 +467,15 @@ class TestHiveServer(RMFTestCase): owner = 'hive', group = 'hadoop', ) - self.assertResourceCalled('Execute', 'hive mkdir -p /tmp/AMBARI-artifacts/ ; rm -f /usr/lib/hive/lib//mysql-connector-java.jar ; cp /usr/share/java/mysql-connector-java.jar /usr/lib/hive/lib//mysql-connector-java.jar', + self.assertResourceCalled('File', '/usr/lib/hive/lib//mysql-connector-java.jar', + action = ['delete'], + ) + self.assertResourceCalled('Execute', ('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" + os.pathsep + "/usr/bin"}, + sudo = True, 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/6ed4fe45/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_mysql_server.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_mysql_server.py b/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_mysql_server.py index 1d35e97..9c1b27a 100644 --- a/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_mysql_server.py +++ b/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_mysql_server.py @@ -38,11 +38,16 @@ class TestMySqlServer(RMFTestCase): config_file="default.json" ) - self.assertResourceCalled('Execute', "sed -i 's|^bind-address[ \t]*=.*|bind-address = 0.0.0.0|' /etc/my.cnf", + self.assertResourceCalled('Execute', ('sed', + '-i', + 's|^bind-address[ \t]*=.*|bind-address = 0.0.0.0|', + '/etc/my.cnf'), + sudo = True, ) self.assertResourceCalled('Execute', 'service mysql start', logoutput = True, - not_if = 'service mysql status | grep running' + not_if = 'service mysql status | grep running', + user = 'mysql', ) self.assertNoMoreResources() @@ -55,6 +60,7 @@ class TestMySqlServer(RMFTestCase): self.assertResourceCalled('Execute', 'service mysql stop', logoutput = True, only_if = 'service mysql status | grep running', + user = 'mysql', ) self.assertNoMoreResources() @@ -75,11 +81,16 @@ class TestMySqlServer(RMFTestCase): config_file="secured.json" ) - self.assertResourceCalled('Execute', "sed -i 's|^bind-address[ \t]*=.*|bind-address = 0.0.0.0|' /etc/my.cnf", + self.assertResourceCalled('Execute', ('sed', + '-i', + 's|^bind-address[ \t]*=.*|bind-address = 0.0.0.0|', + '/etc/my.cnf'), + sudo = True, ) self.assertResourceCalled('Execute', 'service mysql start', logoutput = True, - not_if = 'service mysql status | grep running' + not_if = 'service mysql status | grep running', + user = 'mysql', ) self.assertNoMoreResources() @@ -92,7 +103,8 @@ class TestMySqlServer(RMFTestCase): self.assertResourceCalled('Execute', 'service mysql stop', logoutput = True, - only_if = 'service mysql status | grep running' + only_if = 'service mysql status | grep running', + user = 'mysql', ) self.assertNoMoreResources() http://git-wip-us.apache.org/repos/asf/ambari/blob/6ed4fe45/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_webhcat_server.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_webhcat_server.py b/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_webhcat_server.py index caa6045..fa06253 100644 --- a/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_webhcat_server.py +++ b/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_webhcat_server.py @@ -57,7 +57,9 @@ class TestWebHCatServer(RMFTestCase): self.assertResourceCalled('Execute', 'env HADOOP_HOME=/usr /usr/lib/hcatalog/sbin/webhcat_server.sh stop', user = 'hcat', ) - self.assertResourceCalled('Execute', 'rm -f /var/run/webhcat/webhcat.pid') + self.assertResourceCalled('File', '/var/run/webhcat/webhcat.pid', + action = ['delete'], + ) self.assertNoMoreResources() def test_configure_secured(self): @@ -94,7 +96,9 @@ class TestWebHCatServer(RMFTestCase): self.assertResourceCalled('Execute', 'env HADOOP_HOME=/usr /usr/lib/hcatalog/sbin/webhcat_server.sh stop', user = 'hcat', ) - self.assertResourceCalled('Execute', 'rm -f /var/run/webhcat/webhcat.pid') + self.assertResourceCalled('File', '/var/run/webhcat/webhcat.pid', + action = ['delete'], + ) self.assertNoMoreResources() def assert_configure_default(self): http://git-wip-us.apache.org/repos/asf/ambari/blob/6ed4fe45/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 3c30153..c85b060 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 @@ -63,8 +63,12 @@ class TestOozieServer(RMFTestCase): command = "stop", config_file="default.json" ) - self.assertResourceCalled('Execute', "su -s /bin/bash - oozie -c 'cd /var/tmp/oozie && /usr/lib/oozie/bin/oozie-stop.sh' && rm -f /var/run/oozie/oozie.pid", - only_if = 'ls /var/run/oozie/oozie.pid >/dev/null 2>&1 && ps -p `cat /var/run/oozie/oozie.pid` >/dev/null 2>&1', + self.assertResourceCalled('Execute', 'cd /var/tmp/oozie && /usr/lib/oozie/bin/oozie-stop.sh', + only_if = 'ls /var/run/oozie/oozie.pid >/dev/null 2>&1 && ps -p `cat /var/run/oozie/oozie.pid` >/dev/null 2>&1', + user = 'oozie', + ) + self.assertResourceCalled('File', '/var/run/oozie/oozie.pid', + action = ['delete'], ) self.assertNoMoreResources() @@ -109,9 +113,13 @@ class TestOozieServer(RMFTestCase): command = "stop", config_file="secured.json" ) - self.assertResourceCalled('Execute', "su -s /bin/bash - oozie -c 'cd /var/tmp/oozie && /usr/lib/oozie/bin/oozie-stop.sh' && rm -f /var/run/oozie/oozie.pid", - only_if = 'ls /var/run/oozie/oozie.pid >/dev/null 2>&1 && ps -p `cat /var/run/oozie/oozie.pid` >/dev/null 2>&1', - ) + self.assertResourceCalled('Execute', 'cd /var/tmp/oozie && /usr/lib/oozie/bin/oozie-stop.sh', + only_if = 'ls /var/run/oozie/oozie.pid >/dev/null 2>&1 && ps -p `cat /var/run/oozie/oozie.pid` >/dev/null 2>&1', + user = 'oozie', + ) + self.assertResourceCalled('File', '/var/run/oozie/oozie.pid', + action = ['delete'], + ) self.assertNoMoreResources() @@ -174,6 +182,12 @@ class TestOozieServer(RMFTestCase): action=["delete"], not_if="ls {pid_file} >/dev/null 2>&1 && !(ps `cat {pid_file}` >/dev/null 2>&1)" ) + self.assertResourceCalled('Directory', '/usr/lib/oozie//var/tmp/oozie', + owner = 'oozie', + group = 'hadoop', + recursive = True, + mode = 0755, + ) self.assertResourceCalled('Directory', '/var/run/oozie', owner = 'oozie', group = 'hadoop', @@ -228,19 +242,35 @@ class TestOozieServer(RMFTestCase): recursive = True, mode = 0755, ) - self.assertResourceCalled('Execute', 'cd /usr/lib/oozie && tar -xvf oozie-sharelib.tar.gz', - not_if = 'ls /var/run/oozie/oozie.pid >/dev/null 2>&1 && ps -p `cat /var/run/oozie/oozie.pid` >/dev/null 2>&1', - ) - self.assertResourceCalled('Execute', 'cd /usr/lib/oozie && mkdir -p /var/tmp/oozie', - not_if = 'ls /var/run/oozie/oozie.pid >/dev/null 2>&1 && ps -p `cat /var/run/oozie/oozie.pid` >/dev/null 2>&1', - ) - self.assertResourceCalled('Execute', 'cd /usr/lib/oozie && chown oozie:hadoop /var/tmp/oozie && mkdir -p /usr/lib/oozie/libext && cp /usr/share/HDP-oozie/ext-2.2.zip /usr/lib/oozie/libext && chown oozie:hadoop /usr/lib/oozie/libext/ext-2.2.zip && chown -RL oozie:hadoop /var/lib/oozie/oozie-server/conf && cp /usr/lib/falcon/oozie/ext/falcon-oozie-el-extension-*.jar /usr/lib/oozie/libext && chown oozie:hadoop /usr/lib/oozie/libext/falcon-oozie-el-extension-*.jar', - not_if = 'ls /var/run/oozie/oozie.pid >/dev/null 2>&1 && ps -p `cat /var/run/oozie/oozie.pid` >/dev/null 2>&1', - ) + self.assertResourceCalled('Directory', '/usr/lib/oozie/libext', + recursive = True, + ) + self.assertResourceCalled('Execute', ('tar', '-xvf', '/usr/lib/oozie/oozie-sharelib.tar.gz', '-C', '/usr/lib/oozie'), + not_if = 'ls /var/run/oozie/oozie.pid >/dev/null 2>&1 && ps -p `cat /var/run/oozie/oozie.pid` >/dev/null 2>&1', + sudo = True, + ) + self.assertResourceCalled('Execute', ('cp', '/usr/share/HDP-oozie/ext-2.2.zip', '/usr/lib/oozie/libext'), + not_if = 'ls /var/run/oozie/oozie.pid >/dev/null 2>&1 && ps -p `cat /var/run/oozie/oozie.pid` >/dev/null 2>&1', + sudo = True, + ) + self.assertResourceCalled('Execute', ('chown', u'oozie:hadoop', '/usr/lib/oozie/libext/ext-2.2.zip'), + not_if = 'ls /var/run/oozie/oozie.pid >/dev/null 2>&1 && ps -p `cat /var/run/oozie/oozie.pid` >/dev/null 2>&1', + sudo = True, + ) + self.assertResourceCalled('Execute', ('chown', '-RL', u'oozie:hadoop', '/var/lib/oozie/oozie-server/conf'), + not_if = 'ls /var/run/oozie/oozie.pid >/dev/null 2>&1 && ps -p `cat /var/run/oozie/oozie.pid` >/dev/null 2>&1', + sudo = True, + ) + self.assertResourceCalled('Execute', 'sudo cp /usr/lib/falcon/oozie/ext/falcon-oozie-el-extension-*.jar /usr/lib/oozie/libext', + not_if = 'ls /var/run/oozie/oozie.pid >/dev/null 2>&1 && ps -p `cat /var/run/oozie/oozie.pid` >/dev/null 2>&1', + ) + self.assertResourceCalled('Execute', 'sudo chown oozie:hadoop /usr/lib/oozie/libext/falcon-oozie-el-extension-*.jar', + not_if = 'ls /var/run/oozie/oozie.pid >/dev/null 2>&1 && ps -p `cat /var/run/oozie/oozie.pid` >/dev/null 2>&1', + ) self.assertResourceCalled('Execute', 'cd /var/tmp/oozie && /usr/lib/oozie/bin/oozie-setup.sh prepare-war', - not_if = 'ls /var/run/oozie/oozie.pid >/dev/null 2>&1 && ps -p `cat /var/run/oozie/oozie.pid` >/dev/null 2>&1', - user = 'oozie', - ) + not_if = 'ls /var/run/oozie/oozie.pid >/dev/null 2>&1 && ps -p `cat /var/run/oozie/oozie.pid` >/dev/null 2>&1', + user = 'oozie', + ) def assert_configure_secured(self): @@ -302,7 +332,12 @@ class TestOozieServer(RMFTestCase): action=["delete"], not_if="ls {pid_file} >/dev/null 2>&1 && !(ps `cat {pid_file}` >/dev/null 2>&1)" ) - + self.assertResourceCalled('Directory', '/usr/lib/oozie//var/tmp/oozie', + owner = 'oozie', + group = 'hadoop', + recursive = True, + mode = 0755, + ) self.assertResourceCalled('Directory', '/var/run/oozie', owner = 'oozie', group = 'hadoop', @@ -357,19 +392,35 @@ class TestOozieServer(RMFTestCase): recursive = True, mode = 0755, ) - self.assertResourceCalled('Execute', 'cd /usr/lib/oozie && tar -xvf oozie-sharelib.tar.gz', - not_if = 'ls /var/run/oozie/oozie.pid >/dev/null 2>&1 && ps -p `cat /var/run/oozie/oozie.pid` >/dev/null 2>&1', - ) - self.assertResourceCalled('Execute', 'cd /usr/lib/oozie && mkdir -p /var/tmp/oozie', - not_if = 'ls /var/run/oozie/oozie.pid >/dev/null 2>&1 && ps -p `cat /var/run/oozie/oozie.pid` >/dev/null 2>&1', - ) - self.assertResourceCalled('Execute', 'cd /usr/lib/oozie && chown oozie:hadoop /var/tmp/oozie && mkdir -p /usr/lib/oozie/libext && cp /usr/share/HDP-oozie/ext-2.2.zip /usr/lib/oozie/libext && chown oozie:hadoop /usr/lib/oozie/libext/ext-2.2.zip && chown -RL oozie:hadoop /var/lib/oozie/oozie-server/conf && cp /usr/lib/falcon/oozie/ext/falcon-oozie-el-extension-*.jar /usr/lib/oozie/libext && chown oozie:hadoop /usr/lib/oozie/libext/falcon-oozie-el-extension-*.jar', - not_if = 'ls /var/run/oozie/oozie.pid >/dev/null 2>&1 && ps -p `cat /var/run/oozie/oozie.pid` >/dev/null 2>&1', - ) + self.assertResourceCalled('Directory', '/usr/lib/oozie/libext', + recursive = True, + ) + self.assertResourceCalled('Execute', ('tar', '-xvf', '/usr/lib/oozie/oozie-sharelib.tar.gz', '-C', '/usr/lib/oozie'), + not_if = 'ls /var/run/oozie/oozie.pid >/dev/null 2>&1 && ps -p `cat /var/run/oozie/oozie.pid` >/dev/null 2>&1', + sudo = True, + ) + self.assertResourceCalled('Execute', ('cp', '/usr/share/HDP-oozie/ext-2.2.zip', '/usr/lib/oozie/libext'), + not_if = 'ls /var/run/oozie/oozie.pid >/dev/null 2>&1 && ps -p `cat /var/run/oozie/oozie.pid` >/dev/null 2>&1', + sudo = True, + ) + self.assertResourceCalled('Execute', ('chown', u'oozie:hadoop', '/usr/lib/oozie/libext/ext-2.2.zip'), + not_if = 'ls /var/run/oozie/oozie.pid >/dev/null 2>&1 && ps -p `cat /var/run/oozie/oozie.pid` >/dev/null 2>&1', + sudo = True, + ) + self.assertResourceCalled('Execute', ('chown', '-RL', u'oozie:hadoop', '/var/lib/oozie/oozie-server/conf'), + not_if = 'ls /var/run/oozie/oozie.pid >/dev/null 2>&1 && ps -p `cat /var/run/oozie/oozie.pid` >/dev/null 2>&1', + sudo = True, + ) + self.assertResourceCalled('Execute', 'sudo cp /usr/lib/falcon/oozie/ext/falcon-oozie-el-extension-*.jar /usr/lib/oozie/libext', + not_if = 'ls /var/run/oozie/oozie.pid >/dev/null 2>&1 && ps -p `cat /var/run/oozie/oozie.pid` >/dev/null 2>&1', + ) + self.assertResourceCalled('Execute', 'sudo chown oozie:hadoop /usr/lib/oozie/libext/falcon-oozie-el-extension-*.jar', + not_if = 'ls /var/run/oozie/oozie.pid >/dev/null 2>&1 && ps -p `cat /var/run/oozie/oozie.pid` >/dev/null 2>&1', + ) self.assertResourceCalled('Execute', 'cd /var/tmp/oozie && /usr/lib/oozie/bin/oozie-setup.sh prepare-war', - not_if = 'ls /var/run/oozie/oozie.pid >/dev/null 2>&1 && ps -p `cat /var/run/oozie/oozie.pid` >/dev/null 2>&1', - user = 'oozie', - ) + not_if = 'ls /var/run/oozie/oozie.pid >/dev/null 2>&1 && ps -p `cat /var/run/oozie/oozie.pid` >/dev/null 2>&1', + user = 'oozie', + ) def test_configure_default_hdp22(self): config_file = "stacks/2.0.6/configs/default.json" http://git-wip-us.apache.org/repos/asf/ambari/blob/6ed4fe45/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 9a3c04b..fef7464 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 @@ -61,8 +61,11 @@ class TestHiveMetastore(RMFTestCase): config_file="../../2.1/configs/default.json" ) - self.assertResourceCalled('Execute', 'kill `cat /var/run/hive/hive.pid` >/dev/null 2>&1 && rm -f /var/run/hive/hive.pid', - not_if = '! (ls /var/run/hive/hive.pid >/dev/null 2>&1 && ps -p `cat /var/run/hive/hive.pid` >/dev/null 2>&1)' + self.assertResourceCalled('Execute', 'sudo kill `cat /var/run/hive/hive.pid`', + not_if = '! (ls /var/run/hive/hive.pid >/dev/null 2>&1 && ps -p `cat /var/run/hive/hive.pid` >/dev/null 2>&1)', + ) + self.assertResourceCalled('File', '/var/run/hive/hive.pid', + action = ['delete'], ) self.assertNoMoreResources() @@ -103,8 +106,11 @@ class TestHiveMetastore(RMFTestCase): config_file="../../2.1/configs/secured.json" ) - self.assertResourceCalled('Execute', 'kill `cat /var/run/hive/hive.pid` >/dev/null 2>&1 && rm -f /var/run/hive/hive.pid', - not_if = '! (ls /var/run/hive/hive.pid >/dev/null 2>&1 && ps -p `cat /var/run/hive/hive.pid` >/dev/null 2>&1)' + self.assertResourceCalled('Execute', 'sudo kill `cat /var/run/hive/hive.pid`', + not_if = '! (ls /var/run/hive/hive.pid >/dev/null 2>&1 && ps -p `cat /var/run/hive/hive.pid` >/dev/null 2>&1)', + ) + self.assertResourceCalled('File', '/var/run/hive/hive.pid', + action = ['delete'], ) self.assertNoMoreResources() @@ -167,10 +173,15 @@ class TestHiveMetastore(RMFTestCase): owner = 'hive', group = 'hadoop', ) - self.assertResourceCalled('Execute', 'hive mkdir -p /tmp/AMBARI-artifacts/ ; rm -f /usr/lib/hive/lib//mysql-connector-java.jar ; cp /usr/share/java/mysql-connector-java.jar /usr/lib/hive/lib//mysql-connector-java.jar', + self.assertResourceCalled('File', '/usr/lib/hive/lib//mysql-connector-java.jar', + action = ['delete'], + ) + self.assertResourceCalled('Execute', ('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" + os.pathsep + "/usr/bin"}, + sudo = True, 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\'', @@ -262,10 +273,15 @@ class TestHiveMetastore(RMFTestCase): owner = 'hive', group = 'hadoop', ) - self.assertResourceCalled('Execute', 'hive mkdir -p /tmp/AMBARI-artifacts/ ; rm -f /usr/lib/hive/lib//mysql-connector-java.jar ; cp /usr/share/java/mysql-connector-java.jar /usr/lib/hive/lib//mysql-connector-java.jar', + self.assertResourceCalled('File', '/usr/lib/hive/lib//mysql-connector-java.jar', + action = ['delete'], + ) + self.assertResourceCalled('Execute', ('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" + os.pathsep + "/usr/bin"}, + sudo = True, 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/6ed4fe45/ambari-server/src/test/python/stacks/2.1/STORM/test_storm_drpc_server.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.1/STORM/test_storm_drpc_server.py b/ambari-server/src/test/python/stacks/2.1/STORM/test_storm_drpc_server.py index d5512e3..2527e69 100644 --- a/ambari-server/src/test/python/stacks/2.1/STORM/test_storm_drpc_server.py +++ b/ambari-server/src/test/python/stacks/2.1/STORM/test_storm_drpc_server.py @@ -66,14 +66,16 @@ class TestStormDrpcServer(TestStormBase): command = "stop", config_file="default.json" ) - self.assertResourceCalled('Execute', 'kill `cat /var/run/storm/drpc.pid` >/dev/null 2>&1', - not_if = '! (ls /var/run/storm/drpc.pid >/dev/null 2>&1 && ps -p `cat /var/run/storm/drpc.pid` >/dev/null 2>&1)' + self.assertResourceCalled('Execute', 'sudo kill `cat /var/run/storm/drpc.pid`', + not_if = '! (ls /var/run/storm/drpc.pid >/dev/null 2>&1 && ps -p `cat /var/run/storm/drpc.pid` >/dev/null 2>&1)', ) - self.assertResourceCalled('Execute', 'kill -9 `cat /var/run/storm/drpc.pid` >/dev/null 2>&1', - not_if = 'sleep 2; ! (ls /var/run/storm/drpc.pid >/dev/null 2>&1 && ps -p `cat /var/run/storm/drpc.pid` >/dev/null 2>&1) || sleep 20; ! (ls /var/run/storm/drpc.pid >/dev/null 2>&1 && ps -p `cat /var/run/storm/drpc.pid` >/dev/null 2>&1)', - ignore_failures=True + self.assertResourceCalled('Execute', 'sudo kill -9 `cat /var/run/storm/drpc.pid`', + not_if = 'sleep 2; ! (ls /var/run/storm/drpc.pid >/dev/null 2>&1 && ps -p `cat /var/run/storm/drpc.pid` >/dev/null 2>&1) || sleep 20; ! (ls /var/run/storm/drpc.pid >/dev/null 2>&1 && ps -p `cat /var/run/storm/drpc.pid` >/dev/null 2>&1)', + ignore_failures = True, + ) + self.assertResourceCalled('File', '/var/run/storm/drpc.pid', + action = ['delete'], ) - self.assertResourceCalled('Execute', 'rm -f /var/run/storm/drpc.pid') self.assertNoMoreResources() def test_configure_secured(self): @@ -115,12 +117,14 @@ class TestStormDrpcServer(TestStormBase): command = "stop", config_file="secured.json" ) - self.assertResourceCalled('Execute', 'kill `cat /var/run/storm/drpc.pid` >/dev/null 2>&1', - not_if = '! (ls /var/run/storm/drpc.pid >/dev/null 2>&1 && ps -p `cat /var/run/storm/drpc.pid` >/dev/null 2>&1)' + self.assertResourceCalled('Execute', 'sudo kill `cat /var/run/storm/drpc.pid`', + not_if = '! (ls /var/run/storm/drpc.pid >/dev/null 2>&1 && ps -p `cat /var/run/storm/drpc.pid` >/dev/null 2>&1)', + ) + self.assertResourceCalled('Execute', 'sudo kill -9 `cat /var/run/storm/drpc.pid`', + not_if = 'sleep 2; ! (ls /var/run/storm/drpc.pid >/dev/null 2>&1 && ps -p `cat /var/run/storm/drpc.pid` >/dev/null 2>&1) || sleep 20; ! (ls /var/run/storm/drpc.pid >/dev/null 2>&1 && ps -p `cat /var/run/storm/drpc.pid` >/dev/null 2>&1)', + ignore_failures = True, ) - self.assertResourceCalled('Execute', 'kill -9 `cat /var/run/storm/drpc.pid` >/dev/null 2>&1', - not_if = 'sleep 2; ! (ls /var/run/storm/drpc.pid >/dev/null 2>&1 && ps -p `cat /var/run/storm/drpc.pid` >/dev/null 2>&1) || sleep 20; ! (ls /var/run/storm/drpc.pid >/dev/null 2>&1 && ps -p `cat /var/run/storm/drpc.pid` >/dev/null 2>&1)', - ignore_failures=True + self.assertResourceCalled('File', '/var/run/storm/drpc.pid', + action = ['delete'], ) - self.assertResourceCalled('Execute', 'rm -f /var/run/storm/drpc.pid') self.assertNoMoreResources() http://git-wip-us.apache.org/repos/asf/ambari/blob/6ed4fe45/ambari-server/src/test/python/stacks/2.1/STORM/test_storm_nimbus.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.1/STORM/test_storm_nimbus.py b/ambari-server/src/test/python/stacks/2.1/STORM/test_storm_nimbus.py index 4f53b44..3b82e22 100644 --- a/ambari-server/src/test/python/stacks/2.1/STORM/test_storm_nimbus.py +++ b/ambari-server/src/test/python/stacks/2.1/STORM/test_storm_nimbus.py @@ -65,14 +65,16 @@ class TestStormNimbus(TestStormBase): command = "stop", config_file="default.json" ) - self.assertResourceCalled('Execute', 'kill `cat /var/run/storm/nimbus.pid` >/dev/null 2>&1', - not_if = '! (ls /var/run/storm/nimbus.pid >/dev/null 2>&1 && ps -p `cat /var/run/storm/nimbus.pid` >/dev/null 2>&1)' + self.assertResourceCalled('Execute', 'sudo kill `cat /var/run/storm/nimbus.pid`', + not_if = '! (ls /var/run/storm/nimbus.pid >/dev/null 2>&1 && ps -p `cat /var/run/storm/nimbus.pid` >/dev/null 2>&1)', ) - self.assertResourceCalled('Execute', 'kill -9 `cat /var/run/storm/nimbus.pid` >/dev/null 2>&1', - not_if = 'sleep 2; ! (ls /var/run/storm/nimbus.pid >/dev/null 2>&1 && ps -p `cat /var/run/storm/nimbus.pid` >/dev/null 2>&1) || sleep 20; ! (ls /var/run/storm/nimbus.pid >/dev/null 2>&1 && ps -p `cat /var/run/storm/nimbus.pid` >/dev/null 2>&1)', - ignore_failures=True + self.assertResourceCalled('Execute', 'sudo kill -9 `cat /var/run/storm/nimbus.pid`', + not_if = 'sleep 2; ! (ls /var/run/storm/nimbus.pid >/dev/null 2>&1 && ps -p `cat /var/run/storm/nimbus.pid` >/dev/null 2>&1) || sleep 20; ! (ls /var/run/storm/nimbus.pid >/dev/null 2>&1 && ps -p `cat /var/run/storm/nimbus.pid` >/dev/null 2>&1)', + ignore_failures = True, + ) + self.assertResourceCalled('File', '/var/run/storm/nimbus.pid', + action = ['delete'], ) - self.assertResourceCalled('Execute', 'rm -f /var/run/storm/nimbus.pid') self.assertNoMoreResources() def test_configure_secured(self): @@ -114,13 +116,15 @@ class TestStormNimbus(TestStormBase): command = "stop", config_file="secured.json" ) - self.assertResourceCalled('Execute', 'kill `cat /var/run/storm/nimbus.pid` >/dev/null 2>&1', - not_if = '! (ls /var/run/storm/nimbus.pid >/dev/null 2>&1 && ps -p `cat /var/run/storm/nimbus.pid` >/dev/null 2>&1)' + self.assertResourceCalled('Execute', 'sudo kill `cat /var/run/storm/nimbus.pid`', + not_if = '! (ls /var/run/storm/nimbus.pid >/dev/null 2>&1 && ps -p `cat /var/run/storm/nimbus.pid` >/dev/null 2>&1)', + ) + self.assertResourceCalled('Execute', 'sudo kill -9 `cat /var/run/storm/nimbus.pid`', + not_if = 'sleep 2; ! (ls /var/run/storm/nimbus.pid >/dev/null 2>&1 && ps -p `cat /var/run/storm/nimbus.pid` >/dev/null 2>&1) || sleep 20; ! (ls /var/run/storm/nimbus.pid >/dev/null 2>&1 && ps -p `cat /var/run/storm/nimbus.pid` >/dev/null 2>&1)', + ignore_failures = True, ) - self.assertResourceCalled('Execute', 'kill -9 `cat /var/run/storm/nimbus.pid` >/dev/null 2>&1', - not_if = 'sleep 2; ! (ls /var/run/storm/nimbus.pid >/dev/null 2>&1 && ps -p `cat /var/run/storm/nimbus.pid` >/dev/null 2>&1) || sleep 20; ! (ls /var/run/storm/nimbus.pid >/dev/null 2>&1 && ps -p `cat /var/run/storm/nimbus.pid` >/dev/null 2>&1)', - ignore_failures=True + self.assertResourceCalled('File', '/var/run/storm/nimbus.pid', + action = ['delete'], ) - self.assertResourceCalled('Execute', 'rm -f /var/run/storm/nimbus.pid') self.assertNoMoreResources() http://git-wip-us.apache.org/repos/asf/ambari/blob/6ed4fe45/ambari-server/src/test/python/stacks/2.1/STORM/test_storm_rest_api_service.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.1/STORM/test_storm_rest_api_service.py b/ambari-server/src/test/python/stacks/2.1/STORM/test_storm_rest_api_service.py index 195fa43..a818313 100644 --- a/ambari-server/src/test/python/stacks/2.1/STORM/test_storm_rest_api_service.py +++ b/ambari-server/src/test/python/stacks/2.1/STORM/test_storm_rest_api_service.py @@ -64,14 +64,16 @@ class TestStormRestApi(TestStormBase): command = "stop", config_file="default.json" ) - self.assertResourceCalled('Execute', 'kill `cat /var/run/storm/restapi.pid` >/dev/null 2>&1', - not_if = '! (ls /var/run/storm/restapi.pid >/dev/null 2>&1 && ps -p `cat /var/run/storm/restapi.pid` >/dev/null 2>&1)' + self.assertResourceCalled('Execute', 'sudo kill `cat /var/run/storm/restapi.pid`', + not_if = '! (ls /var/run/storm/restapi.pid >/dev/null 2>&1 && ps -p `cat /var/run/storm/restapi.pid` >/dev/null 2>&1)', ) - self.assertResourceCalled('Execute', 'kill -9 `cat /var/run/storm/restapi.pid` >/dev/null 2>&1', - not_if = 'sleep 2; ! (ls /var/run/storm/restapi.pid >/dev/null 2>&1 && ps -p `cat /var/run/storm/restapi.pid` >/dev/null 2>&1) || sleep 20; ! (ls /var/run/storm/restapi.pid >/dev/null 2>&1 && ps -p `cat /var/run/storm/restapi.pid` >/dev/null 2>&1)', - ignore_failures=True + self.assertResourceCalled('Execute', 'sudo kill -9 `cat /var/run/storm/restapi.pid`', + not_if = 'sleep 2; ! (ls /var/run/storm/restapi.pid >/dev/null 2>&1 && ps -p `cat /var/run/storm/restapi.pid` >/dev/null 2>&1) || sleep 20; ! (ls /var/run/storm/restapi.pid >/dev/null 2>&1 && ps -p `cat /var/run/storm/restapi.pid` >/dev/null 2>&1)', + ignore_failures = True, + ) + self.assertResourceCalled('File', '/var/run/storm/restapi.pid', + action = ['delete'], ) - self.assertResourceCalled('Execute', 'rm -f /var/run/storm/restapi.pid') self.assertNoMoreResources() def test_configure_secured(self): @@ -114,13 +116,15 @@ class TestStormRestApi(TestStormBase): command = "stop", config_file="secured.json" ) - self.assertResourceCalled('Execute', 'kill `cat /var/run/storm/restapi.pid` >/dev/null 2>&1', - not_if = '! (ls /var/run/storm/restapi.pid >/dev/null 2>&1 && ps -p `cat /var/run/storm/restapi.pid` >/dev/null 2>&1)' + self.assertResourceCalled('Execute', 'sudo kill `cat /var/run/storm/restapi.pid`', + not_if = '! (ls /var/run/storm/restapi.pid >/dev/null 2>&1 && ps -p `cat /var/run/storm/restapi.pid` >/dev/null 2>&1)', + ) + self.assertResourceCalled('Execute', 'sudo kill -9 `cat /var/run/storm/restapi.pid`', + not_if = 'sleep 2; ! (ls /var/run/storm/restapi.pid >/dev/null 2>&1 && ps -p `cat /var/run/storm/restapi.pid` >/dev/null 2>&1) || sleep 20; ! (ls /var/run/storm/restapi.pid >/dev/null 2>&1 && ps -p `cat /var/run/storm/restapi.pid` >/dev/null 2>&1)', + ignore_failures = True, ) - self.assertResourceCalled('Execute', 'kill -9 `cat /var/run/storm/restapi.pid` >/dev/null 2>&1', - not_if = 'sleep 2; ! (ls /var/run/storm/restapi.pid >/dev/null 2>&1 && ps -p `cat /var/run/storm/restapi.pid` >/dev/null 2>&1) || sleep 20; ! (ls /var/run/storm/restapi.pid >/dev/null 2>&1 && ps -p `cat /var/run/storm/restapi.pid` >/dev/null 2>&1)', - ignore_failures=True + self.assertResourceCalled('File', '/var/run/storm/restapi.pid', + action = ['delete'], ) - self.assertResourceCalled('Execute', 'rm -f /var/run/storm/restapi.pid') self.assertNoMoreResources() http://git-wip-us.apache.org/repos/asf/ambari/blob/6ed4fe45/ambari-server/src/test/python/stacks/2.1/STORM/test_storm_supervisor.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.1/STORM/test_storm_supervisor.py b/ambari-server/src/test/python/stacks/2.1/STORM/test_storm_supervisor.py index 73801bf..b968b1b 100644 --- a/ambari-server/src/test/python/stacks/2.1/STORM/test_storm_supervisor.py +++ b/ambari-server/src/test/python/stacks/2.1/STORM/test_storm_supervisor.py @@ -77,22 +77,26 @@ class TestStormSupervisor(TestStormBase): command = "stop", config_file="default.json" ) - self.assertResourceCalled('Execute', 'kill `cat /var/run/storm/supervisor.pid` >/dev/null 2>&1', - not_if = '! (ls /var/run/storm/supervisor.pid >/dev/null 2>&1 && ps -p `cat /var/run/storm/supervisor.pid` >/dev/null 2>&1)' + self.assertResourceCalled('Execute', 'sudo kill `cat /var/run/storm/supervisor.pid`', + not_if = '! (ls /var/run/storm/supervisor.pid >/dev/null 2>&1 && ps -p `cat /var/run/storm/supervisor.pid` >/dev/null 2>&1)', ) - self.assertResourceCalled('Execute', 'kill -9 `cat /var/run/storm/supervisor.pid` >/dev/null 2>&1', - not_if = 'sleep 2; ! (ls /var/run/storm/supervisor.pid >/dev/null 2>&1 && ps -p `cat /var/run/storm/supervisor.pid` >/dev/null 2>&1) || sleep 20; ! (ls /var/run/storm/supervisor.pid >/dev/null 2>&1 && ps -p `cat /var/run/storm/supervisor.pid` >/dev/null 2>&1)', - ignore_failures=True + self.assertResourceCalled('Execute', 'sudo kill -9 `cat /var/run/storm/supervisor.pid`', + not_if = 'sleep 2; ! (ls /var/run/storm/supervisor.pid >/dev/null 2>&1 && ps -p `cat /var/run/storm/supervisor.pid` >/dev/null 2>&1) || sleep 20; ! (ls /var/run/storm/supervisor.pid >/dev/null 2>&1 && ps -p `cat /var/run/storm/supervisor.pid` >/dev/null 2>&1)', + ignore_failures = True, + ) + self.assertResourceCalled('File', '/var/run/storm/supervisor.pid', + action = ['delete'], + ) + self.assertResourceCalled('Execute', 'sudo kill `cat /var/run/storm/logviewer.pid`', + not_if = '! (ls /var/run/storm/logviewer.pid >/dev/null 2>&1 && ps -p `cat /var/run/storm/logviewer.pid` >/dev/null 2>&1)', + ) + self.assertResourceCalled('Execute', 'sudo kill -9 `cat /var/run/storm/logviewer.pid`', + not_if = 'sleep 2; ! (ls /var/run/storm/logviewer.pid >/dev/null 2>&1 && ps -p `cat /var/run/storm/logviewer.pid` >/dev/null 2>&1) || sleep 20; ! (ls /var/run/storm/logviewer.pid >/dev/null 2>&1 && ps -p `cat /var/run/storm/logviewer.pid` >/dev/null 2>&1)', + ignore_failures = True, + ) + self.assertResourceCalled('File', '/var/run/storm/logviewer.pid', + action = ['delete'], ) - self.assertResourceCalled('Execute', 'rm -f /var/run/storm/supervisor.pid') - self.assertResourceCalled('Execute', 'kill `cat /var/run/storm/logviewer.pid` >/dev/null 2>&1', - not_if = '! (ls /var/run/storm/logviewer.pid >/dev/null 2>&1 && ps -p `cat /var/run/storm/logviewer.pid` >/dev/null 2>&1)') - - self.assertResourceCalled('Execute', 'kill -9 `cat /var/run/storm/logviewer.pid` >/dev/null 2>&1', - not_if = 'sleep 2; ! (ls /var/run/storm/logviewer.pid >/dev/null 2>&1 && ps -p `cat /var/run/storm/logviewer.pid` >/dev/null 2>&1) || sleep 20; ! (ls /var/run/storm/logviewer.pid >/dev/null 2>&1 && ps -p `cat /var/run/storm/logviewer.pid` >/dev/null 2>&1)', - ignore_failures = True) - - self.assertResourceCalled('Execute', 'rm -f /var/run/storm/logviewer.pid') self.assertNoMoreResources() def test_configure_secured(self): @@ -148,21 +152,25 @@ class TestStormSupervisor(TestStormBase): command = "stop", config_file="secured.json" ) - self.assertResourceCalled('Execute', 'kill `cat /var/run/storm/supervisor.pid` >/dev/null 2>&1', - not_if = '! (ls /var/run/storm/supervisor.pid >/dev/null 2>&1 && ps -p `cat /var/run/storm/supervisor.pid` >/dev/null 2>&1)' - ) - self.assertResourceCalled('Execute', 'kill -9 `cat /var/run/storm/supervisor.pid` >/dev/null 2>&1', - not_if = 'sleep 2; ! (ls /var/run/storm/supervisor.pid >/dev/null 2>&1 && ps -p `cat /var/run/storm/supervisor.pid` >/dev/null 2>&1) || sleep 20; ! (ls /var/run/storm/supervisor.pid >/dev/null 2>&1 && ps -p `cat /var/run/storm/supervisor.pid` >/dev/null 2>&1)', - ignore_failures=True + self.assertResourceCalled('Execute', 'sudo kill `cat /var/run/storm/supervisor.pid`', + not_if = '! (ls /var/run/storm/supervisor.pid >/dev/null 2>&1 && ps -p `cat /var/run/storm/supervisor.pid` >/dev/null 2>&1)', + ) + self.assertResourceCalled('Execute', 'sudo kill -9 `cat /var/run/storm/supervisor.pid`', + not_if = 'sleep 2; ! (ls /var/run/storm/supervisor.pid >/dev/null 2>&1 && ps -p `cat /var/run/storm/supervisor.pid` >/dev/null 2>&1) || sleep 20; ! (ls /var/run/storm/supervisor.pid >/dev/null 2>&1 && ps -p `cat /var/run/storm/supervisor.pid` >/dev/null 2>&1)', + ignore_failures = True, + ) + self.assertResourceCalled('File', '/var/run/storm/supervisor.pid', + action = ['delete'], + ) + self.assertResourceCalled('Execute', 'sudo kill `cat /var/run/storm/logviewer.pid`', + not_if = '! (ls /var/run/storm/logviewer.pid >/dev/null 2>&1 && ps -p `cat /var/run/storm/logviewer.pid` >/dev/null 2>&1)', + ) + self.assertResourceCalled('Execute', 'sudo kill -9 `cat /var/run/storm/logviewer.pid`', + not_if = 'sleep 2; ! (ls /var/run/storm/logviewer.pid >/dev/null 2>&1 && ps -p `cat /var/run/storm/logviewer.pid` >/dev/null 2>&1) || sleep 20; ! (ls /var/run/storm/logviewer.pid >/dev/null 2>&1 && ps -p `cat /var/run/storm/logviewer.pid` >/dev/null 2>&1)', + ignore_failures = True, + ) + self.assertResourceCalled('File', '/var/run/storm/logviewer.pid', + action = ['delete'], ) - self.assertResourceCalled('Execute', 'rm -f /var/run/storm/supervisor.pid') - self.assertResourceCalled('Execute', 'kill `cat /var/run/storm/logviewer.pid` >/dev/null 2>&1', - not_if = '! (ls /var/run/storm/logviewer.pid >/dev/null 2>&1 && ps -p `cat /var/run/storm/logviewer.pid` >/dev/null 2>&1)') - - self.assertResourceCalled('Execute', 'kill -9 `cat /var/run/storm/logviewer.pid` >/dev/null 2>&1', - not_if = 'sleep 2; ! (ls /var/run/storm/logviewer.pid >/dev/null 2>&1 && ps -p `cat /var/run/storm/logviewer.pid` >/dev/null 2>&1) || sleep 20; ! (ls /var/run/storm/logviewer.pid >/dev/null 2>&1 && ps -p `cat /var/run/storm/logviewer.pid` >/dev/null 2>&1)', - ignore_failures = True) - - self.assertResourceCalled('Execute', 'rm -f /var/run/storm/logviewer.pid') self.assertNoMoreResources() http://git-wip-us.apache.org/repos/asf/ambari/blob/6ed4fe45/ambari-server/src/test/python/stacks/2.1/STORM/test_storm_supervisor_prod.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.1/STORM/test_storm_supervisor_prod.py b/ambari-server/src/test/python/stacks/2.1/STORM/test_storm_supervisor_prod.py index 36a7ef5..2822833 100644 --- a/ambari-server/src/test/python/stacks/2.1/STORM/test_storm_supervisor_prod.py +++ b/ambari-server/src/test/python/stacks/2.1/STORM/test_storm_supervisor_prod.py @@ -70,16 +70,16 @@ class TestStormSupervisor(TestStormBase): self.assertResourceCalled('Execute', 'supervisorctl stop storm-supervisor', wait_for_finish = False, ) - self.assertResourceCalled('Execute', 'kill `cat /var/run/storm/logviewer.pid` >/dev/null 2>&1', - not_if = '! (ls /var/run/storm/logviewer.pid >/dev/null 2>&1 && ps -p `cat /var/run/storm/logviewer.pid` >/dev/null 2>&1)', + self.assertResourceCalled('Execute', 'sudo kill `cat /var/run/storm/logviewer.pid`', + not_if = '! (ls /var/run/storm/logviewer.pid >/dev/null 2>&1 && ps -p `cat /var/run/storm/logviewer.pid` >/dev/null 2>&1)', ) - self.assertResourceCalled('Execute', 'kill -9 `cat /var/run/storm/logviewer.pid` >/dev/null 2>&1', - not_if = 'sleep 2; ! (ls /var/run/storm/logviewer.pid >/dev/null 2>&1 && ps -p `cat /var/run/storm/logviewer.pid` >/dev/null 2>&1) || sleep 20; ! (ls /var/run/storm/logviewer.pid >/dev/null 2>&1 && ps -p `cat /var/run/storm/logviewer.pid` >/dev/null 2>&1)', - ignore_failures = True, + self.assertResourceCalled('Execute', 'sudo kill -9 `cat /var/run/storm/logviewer.pid`', + not_if = 'sleep 2; ! (ls /var/run/storm/logviewer.pid >/dev/null 2>&1 && ps -p `cat /var/run/storm/logviewer.pid` >/dev/null 2>&1) || sleep 20; ! (ls /var/run/storm/logviewer.pid >/dev/null 2>&1 && ps -p `cat /var/run/storm/logviewer.pid` >/dev/null 2>&1)', + ignore_failures = True, ) - self.assertResourceCalled('Execute', 'rm -f /var/run/storm/logviewer.pid', + self.assertResourceCalled('File', '/var/run/storm/logviewer.pid', + action = ['delete'], ) - self.assertNoMoreResources() def test_configure_default(self): @@ -128,14 +128,16 @@ class TestStormSupervisor(TestStormBase): self.assertResourceCalled('Execute', 'supervisorctl stop storm-supervisor', wait_for_finish = False, ) - self.assertResourceCalled('Execute', 'kill `cat /var/run/storm/logviewer.pid` >/dev/null 2>&1', - not_if = '! (ls /var/run/storm/logviewer.pid >/dev/null 2>&1 && ps -p `cat /var/run/storm/logviewer.pid` >/dev/null 2>&1)', + + self.assertResourceCalled('Execute', 'sudo kill `cat /var/run/storm/logviewer.pid`', + not_if = '! (ls /var/run/storm/logviewer.pid >/dev/null 2>&1 && ps -p `cat /var/run/storm/logviewer.pid` >/dev/null 2>&1)', ) - self.assertResourceCalled('Execute', 'kill -9 `cat /var/run/storm/logviewer.pid` >/dev/null 2>&1', - not_if = 'sleep 2; ! (ls /var/run/storm/logviewer.pid >/dev/null 2>&1 && ps -p `cat /var/run/storm/logviewer.pid` >/dev/null 2>&1) || sleep 20; ! (ls /var/run/storm/logviewer.pid >/dev/null 2>&1 && ps -p `cat /var/run/storm/logviewer.pid` >/dev/null 2>&1)', - ignore_failures = True, + self.assertResourceCalled('Execute', 'sudo kill -9 `cat /var/run/storm/logviewer.pid`', + not_if = 'sleep 2; ! (ls /var/run/storm/logviewer.pid >/dev/null 2>&1 && ps -p `cat /var/run/storm/logviewer.pid` >/dev/null 2>&1) || sleep 20; ! (ls /var/run/storm/logviewer.pid >/dev/null 2>&1 && ps -p `cat /var/run/storm/logviewer.pid` >/dev/null 2>&1)', + ignore_failures = True, ) - self.assertResourceCalled('Execute', 'rm -f /var/run/storm/logviewer.pid', + self.assertResourceCalled('File', '/var/run/storm/logviewer.pid', + action = ['delete'], ) self.assertNoMoreResources() http://git-wip-us.apache.org/repos/asf/ambari/blob/6ed4fe45/ambari-server/src/test/python/stacks/2.1/STORM/test_storm_ui_server.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.1/STORM/test_storm_ui_server.py b/ambari-server/src/test/python/stacks/2.1/STORM/test_storm_ui_server.py index 85e8f2f..5b6123a 100644 --- a/ambari-server/src/test/python/stacks/2.1/STORM/test_storm_ui_server.py +++ b/ambari-server/src/test/python/stacks/2.1/STORM/test_storm_ui_server.py @@ -63,14 +63,16 @@ class TestStormUiServer(TestStormBase): command = "stop", config_file="default.json" ) - self.assertResourceCalled('Execute', 'kill `cat /var/run/storm/ui.pid` >/dev/null 2>&1', - not_if = '! (ls /var/run/storm/ui.pid >/dev/null 2>&1 && ps -p `cat /var/run/storm/ui.pid` >/dev/null 2>&1)' - ) - self.assertResourceCalled('Execute', 'kill -9 `cat /var/run/storm/ui.pid` >/dev/null 2>&1', - not_if = 'sleep 2; ! (ls /var/run/storm/ui.pid >/dev/null 2>&1 && ps -p `cat /var/run/storm/ui.pid` >/dev/null 2>&1) || sleep 20; ! (ls /var/run/storm/ui.pid >/dev/null 2>&1 && ps -p `cat /var/run/storm/ui.pid` >/dev/null 2>&1)', - ignore_failures=True - ) - self.assertResourceCalled('Execute', 'rm -f /var/run/storm/ui.pid') + self.assertResourceCalled('Execute', 'sudo kill `cat /var/run/storm/ui.pid`', + not_if = '! (ls /var/run/storm/ui.pid >/dev/null 2>&1 && ps -p `cat /var/run/storm/ui.pid` >/dev/null 2>&1)', + ) + self.assertResourceCalled('Execute', 'sudo kill -9 `cat /var/run/storm/ui.pid`', + not_if = 'sleep 2; ! (ls /var/run/storm/ui.pid >/dev/null 2>&1 && ps -p `cat /var/run/storm/ui.pid` >/dev/null 2>&1) || sleep 20; ! (ls /var/run/storm/ui.pid >/dev/null 2>&1 && ps -p `cat /var/run/storm/ui.pid` >/dev/null 2>&1)', + ignore_failures = True, + ) + self.assertResourceCalled('File', '/var/run/storm/ui.pid', + action = ['delete'], + ) self.assertNoMoreResources() def test_configure_secured(self): @@ -113,12 +115,14 @@ class TestStormUiServer(TestStormBase): command = "stop", config_file="secured.json" ) - self.assertResourceCalled('Execute', 'kill `cat /var/run/storm/ui.pid` >/dev/null 2>&1', - not_if = '! (ls /var/run/storm/ui.pid >/dev/null 2>&1 && ps -p `cat /var/run/storm/ui.pid` >/dev/null 2>&1)', - ) - self.assertResourceCalled('Execute', 'kill -9 `cat /var/run/storm/ui.pid` >/dev/null 2>&1', - not_if = 'sleep 2; ! (ls /var/run/storm/ui.pid >/dev/null 2>&1 && ps -p `cat /var/run/storm/ui.pid` >/dev/null 2>&1) || sleep 20; ! (ls /var/run/storm/ui.pid >/dev/null 2>&1 && ps -p `cat /var/run/storm/ui.pid` >/dev/null 2>&1)', - ignore_failures=True - ) - self.assertResourceCalled('Execute', 'rm -f /var/run/storm/ui.pid') + self.assertResourceCalled('Execute', 'sudo kill `cat /var/run/storm/ui.pid`', + not_if = '! (ls /var/run/storm/ui.pid >/dev/null 2>&1 && ps -p `cat /var/run/storm/ui.pid` >/dev/null 2>&1)', + ) + self.assertResourceCalled('Execute', 'sudo kill -9 `cat /var/run/storm/ui.pid`', + not_if = 'sleep 2; ! (ls /var/run/storm/ui.pid >/dev/null 2>&1 && ps -p `cat /var/run/storm/ui.pid` >/dev/null 2>&1) || sleep 20; ! (ls /var/run/storm/ui.pid >/dev/null 2>&1 && ps -p `cat /var/run/storm/ui.pid` >/dev/null 2>&1)', + ignore_failures = True, + ) + self.assertResourceCalled('File', '/var/run/storm/ui.pid', + action = ['delete'], + ) self.assertNoMoreResources() http://git-wip-us.apache.org/repos/asf/ambari/blob/6ed4fe45/ambari-server/src/test/python/stacks/2.2/KNOX/test_knox_gateway.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.2/KNOX/test_knox_gateway.py b/ambari-server/src/test/python/stacks/2.2/KNOX/test_knox_gateway.py index f9c6897..7dfaa83 100644 --- a/ambari-server/src/test/python/stacks/2.2/KNOX/test_knox_gateway.py +++ b/ambari-server/src/test/python/stacks/2.2/KNOX/test_knox_gateway.py @@ -53,17 +53,25 @@ class TestKnoxGateway(RMFTestCase): owner = 'knox', content = InlineTemplate(self.getConfig()['configurations']['topology']['content']) ) - self.assertResourceCalled('Execute', 'chown -R knox:knox /var/lib/knox/data /var/log/knox /var/run/knox /etc/knox/conf' + self.assertResourceCalled('Execute', ('chown', + '-R', + 'knox:knox', + '/var/lib/knox/data', + '/var/log/knox', + '/var/log/knox', + '/var/run/knox', + '/etc/knox/conf'), + sudo = True, ) self.assertResourceCalled('Execute', '/usr/lib/knox/bin/knoxcli.sh create-master --master sa', - user='knox', - environment={'JAVA_HOME': '/usr/jdk64/jdk1.7.0_45'}, - not_if='test -f /var/lib/knox/data/security/master' + environment = {'JAVA_HOME': u'/usr/jdk64/jdk1.7.0_45'}, + not_if = "/usr/bin/sudo su knox -l -s /bin/bash -c 'export {ENV_PLACEHOLDER} > /dev/null ; test -f /var/lib/knox/data/security/master'", + user = 'knox', ) self.assertResourceCalled('Execute', '/usr/lib/knox/bin/knoxcli.sh create-cert --hostname c6401.ambari.apache.org', - user='knox', - environment={'JAVA_HOME': '/usr/jdk64/jdk1.7.0_45'}, - not_if='test -f /var/lib/knox/data/security/keystores/gateway.jks' + environment = {'JAVA_HOME': u'/usr/jdk64/jdk1.7.0_45'}, + not_if = "/usr/bin/sudo su knox -l -s /bin/bash -c 'export {ENV_PLACEHOLDER} > /dev/null ; test -f /var/lib/knox/data/security/master'", + user = 'knox', ) self.assertResourceCalled('File', '/etc/knox/conf/ldap-log4j.properties', mode=0644,