You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by jl...@apache.org on 2014/12/17 21:06:08 UTC
[36/37] ambari git commit: AMBARI-8747: Common Services: Refactor
HDP-2.0.6 PIG, SQOOP services (Jayush Luniya)
http://git-wip-us.apache.org/repos/asf/ambari/blob/191232e2/ambari-server/src/test/python/stacks/2.0.6/PIG/test_pig_service_check.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.0.6/PIG/test_pig_service_check.py b/ambari-server/src/test/python/stacks/2.0.6/PIG/test_pig_service_check.py
index 2521636..fbd6efc 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/PIG/test_pig_service_check.py
+++ b/ambari-server/src/test/python/stacks/2.0.6/PIG/test_pig_service_check.py
@@ -21,12 +21,16 @@ limitations under the License.
from stacks.utils.RMFTestCase import *
class TestPigServiceCheck(RMFTestCase):
-
+ COMMON_SERVICES_PACKAGE_DIR = "PIG/0.12.0.2.0/package"
+ STACK_VERSION = "2.0.6"
+
def test_configure_default(self):
- self.executeScript("2.0.6/services/PIG/package/scripts/service_check.py",
+ self.executeScript(self.COMMON_SERVICES_PACKAGE_DIR + "/scripts/service_check.py",
classname = "PigServiceCheck",
command = "service_check",
- config_file="default.json"
+ config_file="default.json",
+ hdp_stack_version = self.STACK_VERSION,
+ target = RMFTestCase.TARGET_COMMON_SERVICES
)
self.assertResourceCalled('ExecuteHadoop', 'dfs -rmr pigsmoke.out passwd; hadoop --config /etc/hadoop/conf dfs -put /etc/passwd passwd ',
try_sleep = 5,
@@ -59,10 +63,12 @@ class TestPigServiceCheck(RMFTestCase):
self.assertNoMoreResources()
def test_configure_secured(self):
- self.executeScript("2.0.6/services/PIG/package/scripts/service_check.py",
+ self.executeScript(self.COMMON_SERVICES_PACKAGE_DIR + "/scripts/service_check.py",
classname = "PigServiceCheck",
command = "service_check",
- config_file="secured.json"
+ config_file="secured.json",
+ hdp_stack_version = self.STACK_VERSION,
+ target = RMFTestCase.TARGET_COMMON_SERVICES
)
self.assertResourceCalled('ExecuteHadoop', 'dfs -rmr pigsmoke.out passwd; hadoop --config /etc/hadoop/conf dfs -put /etc/passwd passwd ',
http://git-wip-us.apache.org/repos/asf/ambari/blob/191232e2/ambari-server/src/test/python/stacks/2.0.6/SQOOP/test_service_check.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.0.6/SQOOP/test_service_check.py b/ambari-server/src/test/python/stacks/2.0.6/SQOOP/test_service_check.py
index 879a9e6..8b8debe 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/SQOOP/test_service_check.py
+++ b/ambari-server/src/test/python/stacks/2.0.6/SQOOP/test_service_check.py
@@ -21,12 +21,16 @@ from mock.mock import MagicMock, call, patch
from stacks.utils.RMFTestCase import *
class TestSqoopServiceCheck(RMFTestCase):
+ COMMON_SERVICES_PACKAGE_DIR = "SQOOP/1.4.4.2.0/package"
+ STACK_VERSION = "2.0.6"
def test_service_check_secured(self):
- self.executeScript("2.0.6/services/SQOOP/package/scripts/service_check.py",
+ self.executeScript(self.COMMON_SERVICES_PACKAGE_DIR + "/scripts/service_check.py",
classname = "SqoopServiceCheck",
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'
@@ -38,10 +42,12 @@ class TestSqoopServiceCheck(RMFTestCase):
self.assertNoMoreResources()
def test_service_check_default(self):
- self.executeScript("2.0.6/services/SQOOP/package/scripts/service_check.py",
+ self.executeScript(self.COMMON_SERVICES_PACKAGE_DIR + "/scripts/service_check.py",
classname = "SqoopServiceCheck",
command = "service_check",
- config_file="default.json"
+ config_file="default.json",
+ hdp_stack_version = self.STACK_VERSION,
+ target = RMFTestCase.TARGET_COMMON_SERVICES
)
self.assertResourceCalled('Execute', 'sqoop version',
logoutput = True,
http://git-wip-us.apache.org/repos/asf/ambari/blob/191232e2/ambari-server/src/test/python/stacks/2.0.6/SQOOP/test_sqoop.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.0.6/SQOOP/test_sqoop.py b/ambari-server/src/test/python/stacks/2.0.6/SQOOP/test_sqoop.py
index 76948f7..1fe98db 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/SQOOP/test_sqoop.py
+++ b/ambari-server/src/test/python/stacks/2.0.6/SQOOP/test_sqoop.py
@@ -21,12 +21,16 @@ from mock.mock import MagicMock, call, patch
from stacks.utils.RMFTestCase import *
class TestSqoop(RMFTestCase):
+ COMMON_SERVICES_PACKAGE_DIR = "SQOOP/1.4.4.2.0/package"
+ STACK_VERSION = "2.0.6"
def test_configure_default(self):
- self.executeScript("2.0.6/services/SQOOP/package/scripts/sqoop_client.py",
+ self.executeScript(self.COMMON_SERVICES_PACKAGE_DIR + "/scripts/sqoop_client.py",
classname = "SqoopClient",
command = "configure",
- config_file="default.json"
+ config_file="default.json",
+ hdp_stack_version = self.STACK_VERSION,
+ target = RMFTestCase.TARGET_COMMON_SERVICES
)
self.assertResourceCalled('Link', '/usr/lib/sqoop/lib/mysql-connector-java.jar',
to = '/usr/share/java/mysql-connector-java.jar',)