You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by nc...@apache.org on 2016/02/01 16:41:39 UTC
[02/39] ambari git commit: AMBARI-14815 Unit tests for Oozie are not
executed (test run is successful) (dsen)
AMBARI-14815 Unit tests for Oozie are not executed (test run is successful) (dsen)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/ce725290
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/ce725290
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/ce725290
Branch: refs/heads/branch-dev-patch-upgrade
Commit: ce7252909acddde2d8872e4944e1bd52148dab03
Parents: 54311b7
Author: Dmytro Sen <ds...@apache.org>
Authored: Wed Jan 27 18:33:34 2016 +0200
Committer: Dmytro Sen <ds...@apache.org>
Committed: Wed Jan 27 18:33:34 2016 +0200
----------------------------------------------------------------------
.../OOZIE/4.0.0.2.0/package/scripts/oozie.py | 2 +-
.../stacks/2.0.6/OOZIE/test_oozie_client.py | 6 +-
.../stacks/2.0.6/OOZIE/test_oozie_server.py | 117 +++++++++++++------
.../stacks/2.0.6/OOZIE/test_service_check.py | 4 -
ambari-server/src/test/python/unitTests.py | 14 ++-
5 files changed, 95 insertions(+), 48 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/ce725290/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/scripts/oozie.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/scripts/oozie.py b/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/scripts/oozie.py
index 5fc2cfb..24a35ad 100644
--- a/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/scripts/oozie.py
+++ b/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/scripts/oozie.py
@@ -116,7 +116,7 @@ def oozie(is_server=False):
# On some OS this folder could be not exists, so we will create it before pushing there files
Directory(params.limits_conf_dir,
- recursive=True,
+ create_parents=True,
owner='root',
group='root'
)
http://git-wip-us.apache.org/repos/asf/ambari/blob/ce725290/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 4c1a9bc..aab9bb0 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
@@ -55,7 +55,7 @@ class TestOozieClient(RMFTestCase):
self.assertResourceCalled('Directory', '/etc/security/limits.d',
owner = 'root',
group = 'root',
- recursive=True,
+ create_parents=True,
)
self.assertResourceCalled('File', '/etc/security/limits.d/oozie.conf',
owner = 'root',
@@ -121,7 +121,7 @@ class TestOozieClient(RMFTestCase):
self.assertResourceCalled('Directory', '/etc/security/limits.d',
owner = 'root',
group = 'root',
- recursive=True,
+ create_parents=True,
)
self.assertResourceCalled('File', '/etc/security/limits.d/oozie.conf',
owner = 'root',
@@ -193,7 +193,7 @@ class TestOozieClient(RMFTestCase):
self.assertResourceCalled('Directory', '/etc/security/limits.d',
owner = 'root',
group = 'root',
- recursive=True,
+ create_parents=True,
)
self.assertResourceCalled('File', '/etc/security/limits.d/oozie.conf',
owner = 'root',
http://git-wip-us.apache.org/repos/asf/ambari/blob/ce725290/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 d167ef3..2183425 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
@@ -108,7 +108,7 @@ class TestOozieServer(RMFTestCase):
self.assertResourceCalled('Directory', '/etc/security/limits.d',
owner = 'root',
group = 'root',
- recursive=True,
+ create_parents=True,
)
self.assertResourceCalled('File', '/etc/security/limits.d/oozie.conf',
owner = 'root',
@@ -227,9 +227,11 @@ class TestOozieServer(RMFTestCase):
not_if = "ambari-sudo.sh su oozie -l -s /bin/bash -c '[RMF_EXPORT_PLACEHOLDER]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', 'oozie:hadoop', '/var/lib/oozie/oozie-server/conf'),
- not_if = "ambari-sudo.sh su oozie -l -s /bin/bash -c '[RMF_EXPORT_PLACEHOLDER]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('Directory', '/var/lib/oozie/oozie-server/conf',
+ owner = 'oozie',
+ group = 'hadoop',
+ recursion_follow_links = True,
+ recursive_ownership = True,
)
self.assertResourceCalled('File', '/tmp/mysql-connector-java.jar',
content = DownloadSource('http://c6401.ambari.apache.org:8080/resources//mysql-jdbc-driver.jar'),
@@ -263,8 +265,10 @@ class TestOozieServer(RMFTestCase):
content = 'cd /var/tmp/oozie && /usr/lib/oozie/bin/oozie-setup.sh prepare-war ',
mode = 0644,
)
- self.assertResourceCalled('Execute', ('chown', '-R', 'oozie:hadoop', '/var/lib/oozie/oozie-server'),
- sudo = True,
+ self.assertResourceCalled('Directory', '/var/lib/oozie/oozie-server',
+ owner = 'oozie',
+ group = 'hadoop',
+ recursive_ownership = True,
)
@@ -327,7 +331,7 @@ class TestOozieServer(RMFTestCase):
self.assertResourceCalled('Directory', '/etc/security/limits.d',
owner = 'root',
group = 'root',
- recursive=True,
+ create_parents=True,
)
self.assertResourceCalled('File', '/etc/security/limits.d/oozie.conf',
owner = 'root',
@@ -443,9 +447,11 @@ class TestOozieServer(RMFTestCase):
not_if = "ambari-sudo.sh su oozie -l -s /bin/bash -c '[RMF_EXPORT_PLACEHOLDER]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 = "ambari-sudo.sh su oozie -l -s /bin/bash -c '[RMF_EXPORT_PLACEHOLDER]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('Directory', '/var/lib/oozie/oozie-server/conf',
+ owner = 'oozie',
+ group = 'hadoop',
+ recursion_follow_links = True,
+ recursive_ownership = True,
)
self.assertResourceCalled('File', '/tmp/sqla-client-jdbc.tar.gz',
content = DownloadSource('http://c6401.ambari.apache.org:8080/resources//sqlanywhere-jdbc-driver.tar.gz'),
@@ -481,9 +487,11 @@ class TestOozieServer(RMFTestCase):
content = 'cd /var/tmp/oozie && /usr/lib/oozie/bin/oozie-setup.sh prepare-war ',
mode = 0644,
)
- self.assertResourceCalled('Execute', ('chown', '-R', u'oozie:hadoop', '/var/lib/oozie/oozie-server'),
- sudo = True,
- )
+ self.assertResourceCalled('Directory', '/var/lib/oozie/oozie-server',
+ owner = 'oozie',
+ group = 'hadoop',
+ recursive_ownership = True,
+ )
self.assertNoMoreResources()
@@ -698,7 +706,7 @@ class TestOozieServer(RMFTestCase):
self.assertResourceCalled('Directory', '/etc/security/limits.d',
owner = 'root',
group = 'root',
- recursive=True,
+ create_parents=True,
)
self.assertResourceCalled('File', '/etc/security/limits.d/oozie.conf',
owner = 'root',
@@ -814,9 +822,11 @@ class TestOozieServer(RMFTestCase):
not_if = "ambari-sudo.sh su oozie -l -s /bin/bash -c '[RMF_EXPORT_PLACEHOLDER]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', 'oozie:hadoop', '/var/lib/oozie/oozie-server/conf'),
- not_if = "ambari-sudo.sh su oozie -l -s /bin/bash -c '[RMF_EXPORT_PLACEHOLDER]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('Directory', '/var/lib/oozie/oozie-server/conf',
+ owner = 'oozie',
+ group = 'hadoop',
+ recursion_follow_links = True,
+ recursive_ownership = True,
)
self.assertResourceCalled('Execute', 'ambari-sudo.sh cp /usr/lib/falcon/oozie/ext/falcon-oozie-el-extension-*.jar /usr/lib/oozie/libext',
not_if = "ambari-sudo.sh su oozie -l -s /bin/bash -c '[RMF_EXPORT_PLACEHOLDER]ls /var/run/oozie/oozie.pid >/dev/null 2>&1 && ps -p `cat /var/run/oozie/oozie.pid` >/dev/null 2>&1'",
@@ -836,8 +846,10 @@ class TestOozieServer(RMFTestCase):
content = 'cd /var/tmp/oozie && /usr/lib/oozie/bin/oozie-setup.sh prepare-war ',
mode = 0644,
)
- self.assertResourceCalled('Execute', ('chown', '-R', 'oozie:hadoop', '/var/lib/oozie/oozie-server'),
- sudo = True,
+ self.assertResourceCalled('Directory', '/var/lib/oozie/oozie-server',
+ owner = 'oozie',
+ group = 'hadoop',
+ recursive_ownership = True,
)
@@ -888,7 +900,7 @@ class TestOozieServer(RMFTestCase):
self.assertResourceCalled('Directory', '/etc/security/limits.d',
owner = 'root',
group = 'root',
- recursive=True,
+ create_parents=True,
)
self.assertResourceCalled('File', '/etc/security/limits.d/oozie.conf',
owner = 'root',
@@ -1004,9 +1016,11 @@ class TestOozieServer(RMFTestCase):
not_if = "ambari-sudo.sh su oozie -l -s /bin/bash -c '[RMF_EXPORT_PLACEHOLDER]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', 'oozie:hadoop', '/var/lib/oozie/oozie-server/conf'),
- not_if = "ambari-sudo.sh su oozie -l -s /bin/bash -c '[RMF_EXPORT_PLACEHOLDER]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('Directory', '/var/lib/oozie/oozie-server/conf',
+ owner = 'oozie',
+ group = 'hadoop',
+ recursion_follow_links = True,
+ recursive_ownership = True,
)
self.assertResourceCalled('Execute', 'ambari-sudo.sh cp /usr/lib/falcon/oozie/ext/falcon-oozie-el-extension-*.jar /usr/lib/oozie/libext',
not_if = "ambari-sudo.sh su oozie -l -s /bin/bash -c '[RMF_EXPORT_PLACEHOLDER]ls /var/run/oozie/oozie.pid >/dev/null 2>&1 && ps -p `cat /var/run/oozie/oozie.pid` >/dev/null 2>&1'",
@@ -1026,8 +1040,10 @@ class TestOozieServer(RMFTestCase):
content = 'cd /var/tmp/oozie && /usr/lib/oozie/bin/oozie-setup.sh prepare-war -secure',
mode = 0644,
)
- self.assertResourceCalled('Execute', ('chown', '-R', 'oozie:hadoop', '/var/lib/oozie/oozie-server'),
- sudo = True,
+ self.assertResourceCalled('Directory', '/var/lib/oozie/oozie-server',
+ owner = 'oozie',
+ group = 'hadoop',
+ recursive_ownership = True,
)
def test_configure_default_hdp22(self):
@@ -1221,15 +1237,19 @@ class TestOozieServer(RMFTestCase):
self.assertResourceCalled('Execute',
('tar', '-zcvhf', '/tmp/oozie-upgrade-backup/oozie-conf-backup.tar', '/usr/hdp/current/oozie-server/conf/'),
- sudo = True)
-
+ sudo = True,
+ tries = 3,
+ try_sleep = 1
+ )
self.assertResourceCalled('Execute', ('ambari-python-wrap', '/usr/bin/hdp-select', 'set', 'oozie-server', u'2.2.1.0-2135'),
sudo = True )
self.assertResourceCalled('Execute',
('tar', '-xvf', '/tmp/oozie-upgrade-backup/oozie-conf-backup.tar', '-C', '/usr/hdp/current/oozie-server/conf//'),
- sudo = True)
-
+ sudo = True,
+ tries = 3,
+ try_sleep = 1
+ )
self.assertResourceCalled('Directory', '/tmp/oozie-upgrade-backup', action = ['delete'])
self.assertResourceCalled('Directory', '/usr/hdp/current/oozie-server/libext', mode = 0777)
self.assertResourceCalled('Execute', ('cp', '/usr/share/HDP-oozie/ext-2.2.zip', '/usr/hdp/current/oozie-server/libext'), sudo=True)
@@ -1289,13 +1309,21 @@ class TestOozieServer(RMFTestCase):
self.assertResourceCalled('Execute',
('tar', '-zcvhf', '/tmp/oozie-upgrade-backup/oozie-conf-backup.tar', '/usr/hdp/current/oozie-server/conf/'),
- sudo = True)
-
+ sudo = True,
+ tries = 3,
+ try_sleep = 1
+ )
+ self.assertResourceCalled('Link', '/etc/oozie/conf',
+ to = '/usr/hdp/current/oozie-client/conf',
+ )
self.assertResourceCalled('Execute', ('ambari-python-wrap', '/usr/bin/hdp-select', 'set', 'oozie-server', '2.3.0.0-1234'), sudo = True)
self.assertResourceCalled('Execute',
('tar', '-xvf', '/tmp/oozie-upgrade-backup/oozie-conf-backup.tar', '-C', '/usr/hdp/current/oozie-server/conf//'),
- sudo = True)
+ sudo = True,
+ tries = 3,
+ try_sleep = 1
+ )
self.assertResourceCalled('Directory', '/tmp/oozie-upgrade-backup', action = ['delete'])
self.assertResourceCalled('Directory', '/usr/hdp/current/oozie-server/libext', mode = 0777)
@@ -1347,13 +1375,18 @@ class TestOozieServer(RMFTestCase):
self.assertResourceCalled('Execute',
('tar', '-zcvhf', '/tmp/oozie-upgrade-backup/oozie-conf-backup.tar', '/usr/hdp/current/oozie-server/conf/'),
- sudo = True)
-
+ sudo = True,
+ tries = 3,
+ try_sleep = 1
+ )
self.assertResourceCalled('Execute', ('ambari-python-wrap', '/usr/bin/hdp-select', 'set', 'oozie-server', u'2.2.0.0-0000'), sudo = True)
self.assertResourceCalled('Execute',
('tar', '-xvf', '/tmp/oozie-upgrade-backup/oozie-conf-backup.tar', '-C', '/usr/hdp/current/oozie-server/conf//'),
- sudo = True)
+ sudo = True,
+ tries = 3,
+ try_sleep = 1
+ )
self.assertResourceCalled('Directory', '/tmp/oozie-upgrade-backup', action = ['delete'])
self.assertResourceCalled('Directory', '/usr/hdp/current/oozie-server/libext',mode = 0777)
@@ -1547,13 +1580,21 @@ class TestOozieServer(RMFTestCase):
self.assertResourceCalled('Execute',
('tar', '-zcvhf', '/tmp/oozie-upgrade-backup/oozie-conf-backup.tar', '/usr/hdp/current/oozie-server/conf/'),
- sudo = True)
-
+ sudo = True,
+ tries = 3,
+ try_sleep = 1
+ )
+ self.assertResourceCalled('Link', '/etc/oozie/conf',
+ to = '/usr/hdp/current/oozie-client/conf',
+ )
self.assertResourceCalled('Execute', ('ambari-python-wrap', '/usr/bin/hdp-select', 'set', 'oozie-server', '2.3.0.0-1234'), sudo = True)
self.assertResourceCalled('Execute',
('tar', '-xvf', '/tmp/oozie-upgrade-backup/oozie-conf-backup.tar', '-C', '/usr/hdp/current/oozie-server/conf//'),
- sudo = True)
+ sudo = True,
+ tries = 3,
+ try_sleep = 1
+ )
self.assertResourceCalled('Directory', '/tmp/oozie-upgrade-backup', action = ['delete'])
self.assertResourceCalled('Directory', '/usr/hdp/current/oozie-server/libext', mode = 0777)
http://git-wip-us.apache.org/repos/asf/ambari/blob/ce725290/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 4033534..a6d0145 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
@@ -91,7 +91,6 @@ class TestServiceCheck(RMFTestCase):
dfs_type = '',
action = ['delete_on_execute'], hdfs_site=self.getConfig()['configurations']['hdfs-site'], principal_name=UnknownConfigurationMock(), default_fs='hdfs://c6401.ambari.apache.org:8020',
hadoop_conf_dir = '/etc/hadoop/conf',
- dfs_type = '',
type = 'directory',
)
self.assertResourceCalled('HdfsResource', '/user/ambari-qa/examples',
@@ -106,7 +105,6 @@ class TestServiceCheck(RMFTestCase):
hadoop_conf_dir = '/etc/hadoop/conf',
type = 'directory',
owner = 'ambari-qa',
- dfs_type = '',
group = 'hadoop'
)
self.assertResourceCalled('HdfsResource', '/user/ambari-qa/input-data',
@@ -118,7 +116,6 @@ class TestServiceCheck(RMFTestCase):
dfs_type = '',
action = ['delete_on_execute'], hdfs_site=self.getConfig()['configurations']['hdfs-site'], principal_name=UnknownConfigurationMock(), default_fs='hdfs://c6401.ambari.apache.org:8020',
hadoop_conf_dir = '/etc/hadoop/conf',
- dfs_type = '',
type = 'directory',
)
self.assertResourceCalled('HdfsResource', '/user/ambari-qa/input-data',
@@ -133,7 +130,6 @@ class TestServiceCheck(RMFTestCase):
hadoop_conf_dir = '/etc/hadoop/conf',
type = 'directory',
owner = 'ambari-qa',
- dfs_type = '',
group = 'hadoop'
)
self.assertResourceCalled('HdfsResource', None,
http://git-wip-us.apache.org/repos/asf/ambari/blob/ce725290/ambari-server/src/test/python/unitTests.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/unitTests.py b/ambari-server/src/test/python/unitTests.py
index 7bc258d..6368ca1 100644
--- a/ambari-server/src/test/python/unitTests.py
+++ b/ambari-server/src/test/python/unitTests.py
@@ -20,6 +20,7 @@ import unittest
import multiprocessing
import os
import sys
+import traceback
from Queue import Empty
from random import shuffle
import fnmatch
@@ -114,8 +115,17 @@ def stack_test_executor(base_folder, service, stack, custom_tests, executor_resu
#TODO Add an option to randomize the tests' execution
#shuffle(tests)
modules = [os.path.basename(s)[:-3] for s in tests]
- suites = [unittest.defaultTestLoader.loadTestsFromName(name) for name in
- modules]
+ try:
+ suites = [unittest.defaultTestLoader.loadTestsFromName(name) for name in
+ modules]
+ except:
+ executor_result.put({'exit_code': 1,
+ 'tests_run': 0,
+ 'errors': [("Failed to load test files {0}".format(str(modules)), traceback.format_exc(), "ERROR")],
+ 'failures': []})
+ executor_result.put(1)
+ return
+
testSuite = unittest.TestSuite(suites)
textRunner = unittest.TextTestRunner(verbosity=2).run(testSuite)