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 8A26E10215 for ; Wed, 17 Dec 2014 20:05:35 +0000 (UTC) Received: (qmail 44377 invoked by uid 500); 17 Dec 2014 20:05:35 -0000 Delivered-To: apmail-ambari-commits-archive@ambari.apache.org Received: (qmail 44320 invoked by uid 500); 17 Dec 2014 20:05:35 -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 43264 invoked by uid 99); 17 Dec 2014 20:05:34 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 17 Dec 2014 20:05:34 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 8EF7582FE4E; Wed, 17 Dec 2014 20:05:34 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: jluniya@apache.org To: commits@ambari.apache.org Date: Wed, 17 Dec 2014 20:05:57 -0000 Message-Id: <0bd6a04ca8c74901a4034b39fd5eea89@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [25/37] ambari git commit: AMBARI-8746: Common Services: Refactor HDP 2.0.6 HIVE, OOZIE services (Jayush Luniya) http://git-wip-us.apache.org/repos/asf/ambari/blob/46e9bcb8/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 826b100..9017dd3 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 @@ -27,12 +27,16 @@ from stacks.utils.RMFTestCase import * import socket class TestHiveServer(RMFTestCase): + COMMON_SERVICES_PACKAGE_DIR = "HIVE/0.12.0.2.0/package" + STACK_VERSION = "2.0.6" def test_configure_default(self): - self.executeScript("2.0.6/services/HIVE/package/scripts/hive_server.py", + self.executeScript(self.COMMON_SERVICES_PACKAGE_DIR + "/scripts/hive_server.py", classname = "HiveServer", command = "configure", - config_file="default.json" + config_file="default.json", + hdp_stack_version = self.STACK_VERSION, + target = RMFTestCase.TARGET_COMMON_SERVICES ) self.assert_configure_default() self.assertNoMoreResources() @@ -43,10 +47,12 @@ class TestHiveServer(RMFTestCase): def test_start_default(self, socket_mock, popen_mock): s = socket_mock.return_value - self.executeScript("2.0.6/services/HIVE/package/scripts/hive_server.py", + self.executeScript(self.COMMON_SERVICES_PACKAGE_DIR + "/scripts/hive_server.py", classname = "HiveServer", command = "start", - config_file="default.json" + config_file="default.json", + hdp_stack_version = self.STACK_VERSION, + target = RMFTestCase.TARGET_COMMON_SERVICES ) self.assert_configure_default() @@ -71,10 +77,12 @@ class TestHiveServer(RMFTestCase): @patch("socket.socket") def test_stop_default(self, socket_mock): - self.executeScript("2.0.6/services/HIVE/package/scripts/hive_server.py", + self.executeScript(self.COMMON_SERVICES_PACKAGE_DIR + "/scripts/hive_server.py", classname = "HiveServer", command = "stop", - config_file="default.json" + config_file="default.json", + hdp_stack_version = self.STACK_VERSION, + target = RMFTestCase.TARGET_COMMON_SERVICES ) self.assertResourceCalled('Execute', 'sudo kill `cat /var/run/hive/hive-server.pid`', @@ -89,10 +97,12 @@ class TestHiveServer(RMFTestCase): def test_configure_secured(self): - self.executeScript("2.0.6/services/HIVE/package/scripts/hive_server.py", + self.executeScript(self.COMMON_SERVICES_PACKAGE_DIR + "/scripts/hive_server.py", classname = "HiveServer", command = "configure", - config_file="secured.json" + config_file="secured.json", + hdp_stack_version = self.STACK_VERSION, + target = RMFTestCase.TARGET_COMMON_SERVICES ) self.assert_configure_secured() self.assertNoMoreResources() @@ -102,10 +112,12 @@ class TestHiveServer(RMFTestCase): def test_start_secured(self, socket_mock, check_fs_root_mock): s = socket_mock.return_value - self.executeScript("2.0.6/services/HIVE/package/scripts/hive_server.py", + self.executeScript(self.COMMON_SERVICES_PACKAGE_DIR + "/scripts/hive_server.py", classname = "HiveServer", command = "start", - config_file="secured.json" + config_file="secured.json", + hdp_stack_version = self.STACK_VERSION, + target = RMFTestCase.TARGET_COMMON_SERVICES ) self.assert_configure_secured() @@ -132,10 +144,12 @@ class TestHiveServer(RMFTestCase): @patch("socket.socket") def test_stop_secured(self, socket_mock): - self.executeScript("2.0.6/services/HIVE/package/scripts/hive_server.py", + self.executeScript(self.COMMON_SERVICES_PACKAGE_DIR + "/scripts/hive_server.py", classname = "HiveServer", command = "stop", - config_file="secured.json" + config_file="secured.json", + hdp_stack_version = self.STACK_VERSION, + target = RMFTestCase.TARGET_COMMON_SERVICES ) self.assertResourceCalled('Execute', 'sudo kill `cat /var/run/hive/hive-server.pid`', @@ -516,10 +530,12 @@ class TestHiveServer(RMFTestCase): time_mock.side_effect = [0, 1000, 2000, 3000, 4000] try: - self.executeScript("2.0.6/services/HIVE/package/scripts/hive_server.py", + self.executeScript(self.COMMON_SERVICES_PACKAGE_DIR + "/scripts/hive_server.py", classname = "HiveServer", command = "start", - config_file="default.json" + config_file="default.json", + hdp_stack_version = self.STACK_VERSION, + target = RMFTestCase.TARGET_COMMON_SERVICES ) self.fail("Script failure due to socket error was expected") http://git-wip-us.apache.org/repos/asf/ambari/blob/46e9bcb8/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 d13b2c3..6da0ba5 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 @@ -25,14 +25,18 @@ import resource_management.libraries.functions @patch.object(resource_management.libraries.functions, "get_unique_id_and_date", new = MagicMock(return_value='')) @patch("socket.socket") class TestServiceCheck(RMFTestCase): + COMMON_SERVICES_PACKAGE_DIR = "HIVE/0.12.0.2.0/package" + STACK_VERSION = "2.0.6" @patch("sys.exit") def test_service_check_default(self, sys_exit_mock, socket_mock): - self.executeScript("2.0.6/services/HIVE/package/scripts/service_check.py", + self.executeScript(self.COMMON_SERVICES_PACKAGE_DIR + "/scripts/service_check.py", classname="HiveServiceCheck", command="service_check", - config_file="default.json" + config_file="default.json", + hdp_stack_version = self.STACK_VERSION, + target = RMFTestCase.TARGET_COMMON_SERVICES ) self.assertResourceCalled('File', '/tmp/hcatSmoke.sh', content = StaticFile('hcatSmoke.sh'), @@ -85,10 +89,12 @@ class TestServiceCheck(RMFTestCase): @patch("sys.exit") def test_service_check_secured(self, sys_exit_mock, socket_mock): - self.executeScript("2.0.6/services/HIVE/package/scripts/service_check.py", + self.executeScript(self.COMMON_SERVICES_PACKAGE_DIR + "/scripts/service_check.py", classname="HiveServiceCheck", command="service_check", - config_file="secured.json" + config_file="secured.json", + hdp_stack_version = self.STACK_VERSION, + target = RMFTestCase.TARGET_COMMON_SERVICES ) self.assertResourceCalled('Execute', '/usr/bin/kinit -kt /etc/security/keytabs/smokeuser.headless.keytab ambari-qa; ', user = 'ambari-qa', http://git-wip-us.apache.org/repos/asf/ambari/blob/46e9bcb8/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 735e380..79c777b 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 @@ -21,21 +21,27 @@ from mock.mock import MagicMock, call, patch from stacks.utils.RMFTestCase import * class TestMySqlServer(RMFTestCase): + COMMON_SERVICES_PACKAGE_DIR = "HIVE/0.12.0.2.0/package" + STACK_VERSION = "2.0.6" def test_configure_default(self): - self.executeScript("2.0.6/services/HIVE/package/scripts/mysql_server.py", + self.executeScript(self.COMMON_SERVICES_PACKAGE_DIR + "/scripts/mysql_server.py", classname = "MysqlServer", command = "configure", - config_file="default.json" + config_file="default.json", + hdp_stack_version = self.STACK_VERSION, + target = RMFTestCase.TARGET_COMMON_SERVICES ) self.assert_configure_default() self.assertNoMoreResources() def test_start_default(self): - self.executeScript("2.0.6/services/HIVE/package/scripts/mysql_server.py", + self.executeScript(self.COMMON_SERVICES_PACKAGE_DIR + "/scripts/mysql_server.py", classname = "MysqlServer", command = "start", - config_file="default.json" + config_file="default.json", + hdp_stack_version = self.STACK_VERSION, + target = RMFTestCase.TARGET_COMMON_SERVICES ) self.assertResourceCalled('Execute', ('sed', @@ -52,10 +58,12 @@ class TestMySqlServer(RMFTestCase): self.assertNoMoreResources() def test_stop_default(self): - self.executeScript("2.0.6/services/HIVE/package/scripts/mysql_server.py", + self.executeScript(self.COMMON_SERVICES_PACKAGE_DIR + "/scripts/mysql_server.py", classname = "MysqlServer", command = "stop", - config_file="default.json" + config_file="default.json", + hdp_stack_version = self.STACK_VERSION, + target = RMFTestCase.TARGET_COMMON_SERVICES ) self.assertResourceCalled('Execute', ('service','mysql','stop'), logoutput = True, @@ -66,19 +74,23 @@ class TestMySqlServer(RMFTestCase): def test_configure_secured(self): - self.executeScript("2.0.6/services/HIVE/package/scripts/mysql_server.py", + self.executeScript(self.COMMON_SERVICES_PACKAGE_DIR + "/scripts/mysql_server.py", classname = "MysqlServer", command = "configure", - config_file="secured.json" + config_file="secured.json", + hdp_stack_version = self.STACK_VERSION, + target = RMFTestCase.TARGET_COMMON_SERVICES ) self.assert_configure_secured() self.assertNoMoreResources() def test_start_secured(self): - self.executeScript("2.0.6/services/HIVE/package/scripts/mysql_server.py", + self.executeScript(self.COMMON_SERVICES_PACKAGE_DIR + "/scripts/mysql_server.py", classname = "MysqlServer", command = "start", - config_file="secured.json" + config_file="secured.json", + hdp_stack_version = self.STACK_VERSION, + target = RMFTestCase.TARGET_COMMON_SERVICES ) self.assertResourceCalled('Execute', ('sed', @@ -95,10 +107,12 @@ class TestMySqlServer(RMFTestCase): self.assertNoMoreResources() def test_stop_secured(self): - self.executeScript("2.0.6/services/HIVE/package/scripts/mysql_server.py", + self.executeScript(self.COMMON_SERVICES_PACKAGE_DIR + "/scripts/mysql_server.py", classname = "MysqlServer", command = "stop", - config_file="secured.json" + config_file="secured.json", + hdp_stack_version = self.STACK_VERSION, + target = RMFTestCase.TARGET_COMMON_SERVICES ) self.assertResourceCalled('Execute', ('service','mysql','stop'), @@ -109,19 +123,23 @@ class TestMySqlServer(RMFTestCase): self.assertNoMoreResources() def test_clean_default(self): - self.executeScript("2.0.6/services/HIVE/package/scripts/mysql_server.py", + self.executeScript(self.COMMON_SERVICES_PACKAGE_DIR + "/scripts/mysql_server.py", classname = "MysqlServer", command = "clean", - config_file="default.json" + config_file="default.json", + hdp_stack_version = self.STACK_VERSION, + target = RMFTestCase.TARGET_COMMON_SERVICES ) self.assert_clean_default() self.assertNoMoreResources() def test_clean_secured(self): - self.executeScript("2.0.6/services/HIVE/package/scripts/mysql_server.py", + self.executeScript(self.COMMON_SERVICES_PACKAGE_DIR + "/scripts/mysql_server.py", classname = "MysqlServer", command = "clean", - config_file="secured.json" + config_file="secured.json", + hdp_stack_version = self.STACK_VERSION, + target = RMFTestCase.TARGET_COMMON_SERVICES ) self.assert_clean_secured() self.assertNoMoreResources() http://git-wip-us.apache.org/repos/asf/ambari/blob/46e9bcb8/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 fa06253..7ebd4b9 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 @@ -23,21 +23,27 @@ from stacks.utils.RMFTestCase import * @patch("os.path.isfile", new = MagicMock(return_value=True)) @patch("glob.glob", new = MagicMock(return_value=["one", "two"])) class TestWebHCatServer(RMFTestCase): + COMMON_SERVICES_PACKAGE_DIR = "HIVE/0.12.0.2.0/package" + STACK_VERSION = "2.0.6" def test_configure_default(self): - self.executeScript("2.0.6/services/HIVE/package/scripts/webhcat_server.py", + self.executeScript(self.COMMON_SERVICES_PACKAGE_DIR + "/scripts/webhcat_server.py", classname = "WebHCatServer", command = "configure", - config_file="default.json" + config_file="default.json", + hdp_stack_version = self.STACK_VERSION, + target = RMFTestCase.TARGET_COMMON_SERVICES ) self.assert_configure_default() self.assertNoMoreResources() def test_start_default(self): - self.executeScript("2.0.6/services/HIVE/package/scripts/webhcat_server.py", + self.executeScript(self.COMMON_SERVICES_PACKAGE_DIR + "/scripts/webhcat_server.py", classname = "WebHCatServer", command = "start", - config_file="default.json" + config_file="default.json", + hdp_stack_version = self.STACK_VERSION, + target = RMFTestCase.TARGET_COMMON_SERVICES ) self.assert_configure_default() @@ -48,10 +54,12 @@ class TestWebHCatServer(RMFTestCase): self.assertNoMoreResources() def test_stop_default(self): - self.executeScript("2.0.6/services/HIVE/package/scripts/webhcat_server.py", + self.executeScript(self.COMMON_SERVICES_PACKAGE_DIR + "/scripts/webhcat_server.py", classname = "WebHCatServer", command = "stop", - config_file="default.json" + config_file="default.json", + hdp_stack_version = self.STACK_VERSION, + target = RMFTestCase.TARGET_COMMON_SERVICES ) self.assertResourceCalled('Execute', 'env HADOOP_HOME=/usr /usr/lib/hcatalog/sbin/webhcat_server.sh stop', @@ -63,20 +71,24 @@ class TestWebHCatServer(RMFTestCase): self.assertNoMoreResources() def test_configure_secured(self): - self.executeScript("2.0.6/services/HIVE/package/scripts/webhcat_server.py", + self.executeScript(self.COMMON_SERVICES_PACKAGE_DIR + "/scripts/webhcat_server.py", classname = "WebHCatServer", command = "configure", - config_file="secured.json" + config_file="secured.json", + hdp_stack_version = self.STACK_VERSION, + target = RMFTestCase.TARGET_COMMON_SERVICES ) self.assert_configure_secured() self.assertNoMoreResources() def test_start_secured(self): - self.executeScript("2.0.6/services/HIVE/package/scripts/webhcat_server.py", + self.executeScript(self.COMMON_SERVICES_PACKAGE_DIR + "/scripts/webhcat_server.py", classname = "WebHCatServer", command = "start", - config_file="secured.json" + config_file="secured.json", + hdp_stack_version = self.STACK_VERSION, + target = RMFTestCase.TARGET_COMMON_SERVICES ) self.assert_configure_secured() @@ -87,10 +99,12 @@ class TestWebHCatServer(RMFTestCase): self.assertNoMoreResources() def test_stop_secured(self): - self.executeScript("2.0.6/services/HIVE/package/scripts/webhcat_server.py", + self.executeScript(self.COMMON_SERVICES_PACKAGE_DIR + "/scripts/webhcat_server.py", classname = "WebHCatServer", command = "stop", - config_file="secured.json" + config_file="secured.json", + hdp_stack_version = self.STACK_VERSION, + target = RMFTestCase.TARGET_COMMON_SERVICES ) self.assertResourceCalled('Execute', 'env HADOOP_HOME=/usr /usr/lib/hcatalog/sbin/webhcat_server.sh stop', http://git-wip-us.apache.org/repos/asf/ambari/blob/46e9bcb8/ambari-server/src/test/python/stacks/2.0.6/OOZIE/test_oozie_client.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.0.6/OOZIE/test_oozie_client.py b/ambari-server/src/test/python/stacks/2.0.6/OOZIE/test_oozie_client.py index c19c312..f02b55b 100644 --- a/ambari-server/src/test/python/stacks/2.0.6/OOZIE/test_oozie_client.py +++ b/ambari-server/src/test/python/stacks/2.0.6/OOZIE/test_oozie_client.py @@ -22,12 +22,16 @@ from stacks.utils.RMFTestCase import * import json class TestOozieClient(RMFTestCase): + COMMON_SERVICES_PACKAGE_DIR = "OOZIE/4.0.0.2.0/package" + STACK_VERSION = "2.0.6" def test_configure_default(self): - self.executeScript("2.0.6/services/OOZIE/package/scripts/oozie_client.py", + self.executeScript(self.COMMON_SERVICES_PACKAGE_DIR + "/scripts/oozie_client.py", classname = "OozieClient", command = "configure", - config_file="default.json" + config_file="default.json", + hdp_stack_version = self.STACK_VERSION, + target = RMFTestCase.TARGET_COMMON_SERVICES ) self.assertResourceCalled('Directory', '/etc/oozie/conf', owner = 'oozie', @@ -76,10 +80,12 @@ class TestOozieClient(RMFTestCase): def test_configure_secured(self): - self.executeScript("2.0.6/services/OOZIE/package/scripts/oozie_client.py", + self.executeScript(self.COMMON_SERVICES_PACKAGE_DIR + "/scripts/oozie_client.py", classname = "OozieClient", command = "configure", - config_file="secured.json" + config_file="secured.json", + hdp_stack_version = self.STACK_VERSION, + target = RMFTestCase.TARGET_COMMON_SERVICES ) self.assertResourceCalled('Directory', '/etc/oozie/conf', owner = 'oozie', @@ -134,10 +140,12 @@ class TestOozieClient(RMFTestCase): default_json['hostLevelParams']['stack_version']= '2.2' - self.executeScript("2.0.6/services/OOZIE/package/scripts/oozie_client.py", + self.executeScript(self.COMMON_SERVICES_PACKAGE_DIR + "/scripts/oozie_client.py", classname = "OozieClient", command = "configure", - config_dict=default_json + config_dict=default_json, + hdp_stack_version = self.STACK_VERSION, + target = RMFTestCase.TARGET_COMMON_SERVICES ) self.assertResourceCalled('Directory', '/etc/oozie/conf', owner = 'oozie', http://git-wip-us.apache.org/repos/asf/ambari/blob/46e9bcb8/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 dd768e2..1fa2677 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 @@ -21,11 +21,16 @@ from mock.mock import MagicMock, call, patch from stacks.utils.RMFTestCase import * class TestOozieServer(RMFTestCase): + COMMON_SERVICES_PACKAGE_DIR = "OOZIE/4.0.0.2.0/package" + STACK_VERSION = "2.0.6" + def test_configure_default(self): - self.executeScript("2.0.6/services/OOZIE/package/scripts/oozie_server.py", + self.executeScript(self.COMMON_SERVICES_PACKAGE_DIR + "/scripts/oozie_server.py", classname = "OozieServer", command = "configure", - config_file="default.json" + config_file="default.json", + hdp_stack_version = self.STACK_VERSION, + target = RMFTestCase.TARGET_COMMON_SERVICES ) self.assert_configure_default() self.assertNoMoreResources() @@ -34,10 +39,12 @@ class TestOozieServer(RMFTestCase): @patch("os.path.isfile") def test_start_default(self, isfile_mock): isfile_mock.return_value = True - self.executeScript("2.0.6/services/OOZIE/package/scripts/oozie_server.py", + self.executeScript(self.COMMON_SERVICES_PACKAGE_DIR + "/scripts/oozie_server.py", classname = "OozieServer", command = "start", - config_file="default.json" + config_file="default.json", + hdp_stack_version = self.STACK_VERSION, + target = RMFTestCase.TARGET_COMMON_SERVICES ) self.assert_configure_default() self.assertResourceCalled('Execute', 'cd /var/tmp/oozie && /usr/lib/oozie/bin/ooziedb.sh create -sqlfile oozie.sql -run', @@ -58,10 +65,12 @@ class TestOozieServer(RMFTestCase): def test_stop_default(self): - self.executeScript("2.0.6/services/OOZIE/package/scripts/oozie_server.py", + self.executeScript(self.COMMON_SERVICES_PACKAGE_DIR + "/scripts/oozie_server.py", classname = "OozieServer", command = "stop", - config_file="default.json" + config_file="default.json", + hdp_stack_version = self.STACK_VERSION, + target = RMFTestCase.TARGET_COMMON_SERVICES ) 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', @@ -74,10 +83,12 @@ class TestOozieServer(RMFTestCase): def test_configure_secured(self): - self.executeScript("2.0.6/services/OOZIE/package/scripts/oozie_server.py", + self.executeScript(self.COMMON_SERVICES_PACKAGE_DIR + "/scripts/oozie_server.py", classname = "OozieServer", command = "configure", - config_file="secured.json" + config_file="secured.json", + hdp_stack_version = self.STACK_VERSION, + target = RMFTestCase.TARGET_COMMON_SERVICES ) self.assert_configure_secured() self.assertNoMoreResources() @@ -85,10 +96,12 @@ class TestOozieServer(RMFTestCase): @patch("os.path.isfile") def test_start_secured(self, isfile_mock): isfile_mock.return_value = True - self.executeScript("2.0.6/services/OOZIE/package/scripts/oozie_server.py", + self.executeScript(self.COMMON_SERVICES_PACKAGE_DIR + "/scripts/oozie_server.py", classname = "OozieServer", command = "start", - config_file="secured.json" + config_file="secured.json", + hdp_stack_version = self.STACK_VERSION, + target = RMFTestCase.TARGET_COMMON_SERVICES ) self.assert_configure_secured() self.assertResourceCalled('Execute', 'cd /var/tmp/oozie && /usr/lib/oozie/bin/ooziedb.sh create -sqlfile oozie.sql -run', @@ -108,10 +121,12 @@ class TestOozieServer(RMFTestCase): self.assertNoMoreResources() def test_stop_secured(self): - self.executeScript("2.0.6/services/OOZIE/package/scripts/oozie_server.py", + self.executeScript(self.COMMON_SERVICES_PACKAGE_DIR + "/scripts/oozie_server.py", classname = "OozieServer", command = "stop", - config_file="secured.json" + config_file="secured.json", + hdp_stack_version = self.STACK_VERSION, + target = RMFTestCase.TARGET_COMMON_SERVICES ) 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', @@ -434,10 +449,12 @@ class TestOozieServer(RMFTestCase): default_json = json.load(f) default_json['hostLevelParams']['stack_version']= '2.2' - self.executeScript("2.0.6/services/OOZIE/package/scripts/oozie_server.py", + self.executeScript(self.COMMON_SERVICES_PACKAGE_DIR + "/scripts/oozie_server.py", classname = "OozieServer", command = "configure", - config_file="default.json" + config_file="default.json", + hdp_stack_version = self.STACK_VERSION, + target = RMFTestCase.TARGET_COMMON_SERVICES ) self.assert_configure_default() self.assertResourceCalled('Directory', '/etc/oozie/conf/action-conf/hive', http://git-wip-us.apache.org/repos/asf/ambari/blob/46e9bcb8/ambari-server/src/test/python/stacks/2.0.6/OOZIE/test_service_check.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.0.6/OOZIE/test_service_check.py b/ambari-server/src/test/python/stacks/2.0.6/OOZIE/test_service_check.py index 2c8165c..59ab5c6 100644 --- a/ambari-server/src/test/python/stacks/2.0.6/OOZIE/test_service_check.py +++ b/ambari-server/src/test/python/stacks/2.0.6/OOZIE/test_service_check.py @@ -22,21 +22,28 @@ import resource_management.libraries.functions from mock.mock import MagicMock, call, patch class TestServiceCheck(RMFTestCase): + COMMON_SERVICES_PACKAGE_DIR = "OOZIE/4.0.0.2.0/package" + STACK_VERSION = "2.0.6" + def test_service_check_default(self): - self.executeScript("2.0.6/services/OOZIE/package/scripts/service_check.py", + self.executeScript(self.COMMON_SERVICES_PACKAGE_DIR + "/scripts/service_check.py", classname="OozieServiceCheck", command="service_check", - config_file="default.json" + config_file="default.json", + hdp_stack_version = self.STACK_VERSION, + target = RMFTestCase.TARGET_COMMON_SERVICES ) self.assert_service_check() self.assertNoMoreResources() def test_service_check_secured(self): - self.executeScript("2.0.6/services/OOZIE/package/scripts/service_check.py", + self.executeScript(self.COMMON_SERVICES_PACKAGE_DIR + "/scripts/service_check.py", classname="OozieServiceCheck", command="service_check", - config_file="default.json" + config_file="default.json", + hdp_stack_version = self.STACK_VERSION, + target = RMFTestCase.TARGET_COMMON_SERVICES ) self.assert_service_check() http://git-wip-us.apache.org/repos/asf/ambari/blob/46e9bcb8/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 4693bc2..1709dcb 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 @@ -22,20 +22,26 @@ from mock.mock import MagicMock, call, patch from stacks.utils.RMFTestCase import * class TestHiveMetastore(RMFTestCase): - + COMMON_SERVICES_PACKAGE_DIR = "HIVE/0.12.0.2.0/package" + STACK_VERSION = "2.0.6" + def test_configure_default(self): - self.executeScript("2.0.6/services/HIVE/package/scripts/hive_metastore.py", + self.executeScript(self.COMMON_SERVICES_PACKAGE_DIR + "/scripts/hive_metastore.py", classname = "HiveMetastore", command = "configure", - config_file="../../2.1/configs/default.json" + config_file="../../2.1/configs/default.json", + hdp_stack_version = self.STACK_VERSION, + target = RMFTestCase.TARGET_COMMON_SERVICES ) self.assert_configure_default() def test_start_default(self): - self.executeScript("2.0.6/services/HIVE/package/scripts/hive_metastore.py", + self.executeScript(self.COMMON_SERVICES_PACKAGE_DIR + "/scripts/hive_metastore.py", classname = "HiveMetastore", command = "start", - config_file="../../2.1/configs/default.json" + config_file="../../2.1/configs/default.json", + hdp_stack_version = self.STACK_VERSION, + target = RMFTestCase.TARGET_COMMON_SERVICES ) self.assert_configure_default() @@ -55,10 +61,12 @@ class TestHiveMetastore(RMFTestCase): self.assertNoMoreResources() def test_stop_default(self): - self.executeScript("2.0.6/services/HIVE/package/scripts/hive_metastore.py", + self.executeScript(self.COMMON_SERVICES_PACKAGE_DIR + "/scripts/hive_metastore.py", classname = "HiveMetastore", command = "stop", - config_file="../../2.1/configs/default.json" + config_file="../../2.1/configs/default.json", + hdp_stack_version = self.STACK_VERSION, + target = RMFTestCase.TARGET_COMMON_SERVICES ) self.assertResourceCalled('Execute', 'sudo kill `cat /var/run/hive/hive.pid`', @@ -70,19 +78,23 @@ class TestHiveMetastore(RMFTestCase): self.assertNoMoreResources() def test_configure_secured(self): - self.executeScript("2.0.6/services/HIVE/package/scripts/hive_metastore.py", + self.executeScript(self.COMMON_SERVICES_PACKAGE_DIR + "/scripts/hive_metastore.py", classname = "HiveMetastore", command = "configure", - config_file="../../2.1/configs/secured.json" + config_file="../../2.1/configs/secured.json", + hdp_stack_version = self.STACK_VERSION, + target = RMFTestCase.TARGET_COMMON_SERVICES ) self.assert_configure_secured() self.assertNoMoreResources() def test_start_secured(self): - self.executeScript("2.0.6/services/HIVE/package/scripts/hive_metastore.py", + self.executeScript(self.COMMON_SERVICES_PACKAGE_DIR + "/scripts/hive_metastore.py", classname = "HiveMetastore", command = "start", - config_file="../../2.1/configs/secured.json" + config_file="../../2.1/configs/secured.json", + hdp_stack_version = self.STACK_VERSION, + target = RMFTestCase.TARGET_COMMON_SERVICES ) self.assert_configure_secured() @@ -100,10 +112,12 @@ class TestHiveMetastore(RMFTestCase): self.assertNoMoreResources() def test_stop_secured(self): - self.executeScript("2.0.6/services/HIVE/package/scripts/hive_metastore.py", + self.executeScript(self.COMMON_SERVICES_PACKAGE_DIR + "/scripts/hive_metastore.py", classname = "HiveMetastore", command = "stop", - config_file="../../2.1/configs/secured.json" + config_file="../../2.1/configs/secured.json", + hdp_stack_version = self.STACK_VERSION, + target = RMFTestCase.TARGET_COMMON_SERVICES ) self.assertResourceCalled('Execute', 'sudo kill `cat /var/run/hive/hive.pid`',