You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ao...@apache.org on 2014/02/17 18:18:56 UTC
[2/5] git commit: AMBARI-4700. Oozie tests fails (Ivan Kozlov via
aonishuk)
AMBARI-4700. Oozie tests fails (Ivan Kozlov via aonishuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/1367ceb2
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/1367ceb2
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/1367ceb2
Branch: refs/heads/trunk
Commit: 1367ceb2300d4778b2dfbef654e864e7138759dd
Parents: a5a0203
Author: Andrew Onischuk <ao...@hortonworks.com>
Authored: Mon Feb 17 08:43:07 2014 -0800
Committer: Andrew Onischuk <ao...@hortonworks.com>
Committed: Mon Feb 17 09:18:37 2014 -0800
----------------------------------------------------------------------
.../stacks/1.3.2/OOZIE/test_oozie_client.py | 14 ++++++++++
.../stacks/1.3.2/OOZIE/test_oozie_server.py | 28 ++++++++++++++++++++
.../python/stacks/1.3.2/configs/default.json | 3 +++
.../python/stacks/1.3.2/configs/secured.json | 3 +++
.../stacks/2.0.6/OOZIE/test_oozie_client.py | 14 ++++++++++
.../stacks/2.0.6/OOZIE/test_oozie_server.py | 14 ++++++++++
.../python/stacks/2.0.6/configs/default.json | 3 +++
.../python/stacks/2.0.6/configs/secured.json | 3 +++
8 files changed, 82 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/1367ceb2/ambari-server/src/test/python/stacks/1.3.2/OOZIE/test_oozie_client.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/1.3.2/OOZIE/test_oozie_client.py b/ambari-server/src/test/python/stacks/1.3.2/OOZIE/test_oozie_client.py
index e60b1ad..eed555d 100644
--- a/ambari-server/src/test/python/stacks/1.3.2/OOZIE/test_oozie_client.py
+++ b/ambari-server/src/test/python/stacks/1.3.2/OOZIE/test_oozie_client.py
@@ -42,6 +42,13 @@ class TestOozieClient(RMFTestCase):
self.assertResourceCalled('TemplateConfig', '/etc/oozie/conf/oozie-env.sh',
owner = 'oozie',
)
+ self.assertResourceCalled('PropertiesFile', 'oozie-log4j.properties',
+ owner = 'oozie',
+ group = 'hadoop',
+ mode = 0664,
+ dir = '/etc/oozie/conf',
+ properties = self.getConfig()['configurations']['oozie-log4j'],
+ )
self.assertResourceCalled('File', '/etc/oozie/conf/adminusers.txt',
owner = 'oozie',
group = 'hadoop',
@@ -85,6 +92,13 @@ class TestOozieClient(RMFTestCase):
self.assertResourceCalled('TemplateConfig', '/etc/oozie/conf/oozie-env.sh',
owner = 'oozie',
)
+ self.assertResourceCalled('PropertiesFile', 'oozie-log4j.properties',
+ owner = 'oozie',
+ group = 'hadoop',
+ mode = 0664,
+ dir = '/etc/oozie/conf',
+ properties = self.getConfig()['configurations']['oozie-log4j'],
+ )
self.assertResourceCalled('File', '/etc/oozie/conf/adminusers.txt',
owner = 'oozie',
group = 'hadoop',
http://git-wip-us.apache.org/repos/asf/ambari/blob/1367ceb2/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 7093ac7..b70dda3 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
@@ -52,6 +52,13 @@ class TestOozieServer(RMFTestCase):
self.assertResourceCalled('TemplateConfig', '/etc/oozie/conf/oozie-env.sh',
owner = 'oozie',
)
+ self.assertResourceCalled('PropertiesFile', 'oozie-log4j.properties',
+ owner = 'oozie',
+ group = 'hadoop',
+ mode = 0664,
+ dir = '/etc/oozie/conf',
+ properties = self.getConfig()['configurations']['oozie-log4j'],
+ )
self.assertResourceCalled('File', '/etc/oozie/conf/adminusers.txt',
owner = 'oozie',
group = 'hadoop',
@@ -183,6 +190,13 @@ class TestOozieServer(RMFTestCase):
self.assertResourceCalled('TemplateConfig', '/etc/oozie/conf/oozie-env.sh',
owner = 'oozie',
)
+ self.assertResourceCalled('PropertiesFile', 'oozie-log4j.properties',
+ owner = 'oozie',
+ group = 'hadoop',
+ mode = 0664,
+ dir = '/etc/oozie/conf',
+ properties = self.getConfig()['configurations']['oozie-log4j'],
+ )
self.assertResourceCalled('File', '/etc/oozie/conf/adminusers.txt',
owner = 'oozie',
group = 'hadoop',
@@ -308,6 +322,13 @@ class TestOozieServer(RMFTestCase):
self.assertResourceCalled('TemplateConfig', '/etc/oozie/conf/oozie-env.sh',
owner = 'oozie',
)
+ self.assertResourceCalled('PropertiesFile', 'oozie-log4j.properties',
+ owner = 'oozie',
+ group = 'hadoop',
+ mode = 0664,
+ dir = '/etc/oozie/conf',
+ properties = self.getConfig()['configurations']['oozie-log4j'],
+ )
self.assertResourceCalled('File', '/etc/oozie/conf/adminusers.txt',
owner = 'oozie',
group = 'hadoop',
@@ -397,6 +418,13 @@ class TestOozieServer(RMFTestCase):
self.assertResourceCalled('TemplateConfig', '/etc/oozie/conf/oozie-env.sh',
owner = 'oozie',
)
+ self.assertResourceCalled('PropertiesFile', 'oozie-log4j.properties',
+ owner = 'oozie',
+ group = 'hadoop',
+ mode = 0664,
+ dir = '/etc/oozie/conf',
+ properties = self.getConfig()['configurations']['oozie-log4j'],
+ )
self.assertResourceCalled('File', '/etc/oozie/conf/adminusers.txt',
owner = 'oozie',
group = 'hadoop',
http://git-wip-us.apache.org/repos/asf/ambari/blob/1367ceb2/ambari-server/src/test/python/stacks/1.3.2/configs/default.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/1.3.2/configs/default.json b/ambari-server/src/test/python/stacks/1.3.2/configs/default.json
index 299cc99..70a3132 100644
--- a/ambari-server/src/test/python/stacks/1.3.2/configs/default.json
+++ b/ambari-server/src/test/python/stacks/1.3.2/configs/default.json
@@ -370,6 +370,9 @@
},
"pig-log4j": {
"property1": "value1"
+ },
+ "oozie-log4j": {
+ "property1": "value1"
}
},
"configurationTags": {
http://git-wip-us.apache.org/repos/asf/ambari/blob/1367ceb2/ambari-server/src/test/python/stacks/1.3.2/configs/secured.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/1.3.2/configs/secured.json b/ambari-server/src/test/python/stacks/1.3.2/configs/secured.json
index c96ea60..7e3d39d 100644
--- a/ambari-server/src/test/python/stacks/1.3.2/configs/secured.json
+++ b/ambari-server/src/test/python/stacks/1.3.2/configs/secured.json
@@ -475,6 +475,9 @@
},
"pig-log4j": {
"property1": "value1"
+ },
+ "oozie-log4j": {
+ "property1": "value1"
}
},
"configurationTags": {
http://git-wip-us.apache.org/repos/asf/ambari/blob/1367ceb2/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 358cab9..bc84440 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
@@ -45,6 +45,13 @@ class TestOozieClient(RMFTestCase):
self.assertResourceCalled('TemplateConfig', '/etc/oozie/conf/oozie-env.sh',
owner = 'oozie',
)
+ self.assertResourceCalled('PropertiesFile', 'oozie-log4j.properties',
+ owner = 'oozie',
+ group = 'hadoop',
+ mode = 0664,
+ dir = '/etc/oozie/conf',
+ properties = self.getConfig()['configurations']['oozie-log4j'],
+ )
self.assertResourceCalled('File', '/etc/oozie/conf/adminusers.txt',
owner = 'oozie',
group = 'hadoop',
@@ -91,6 +98,13 @@ class TestOozieClient(RMFTestCase):
self.assertResourceCalled('TemplateConfig', '/etc/oozie/conf/oozie-env.sh',
owner = 'oozie',
)
+ self.assertResourceCalled('PropertiesFile', 'oozie-log4j.properties',
+ owner = 'oozie',
+ group = 'hadoop',
+ mode = 0664,
+ dir = '/etc/oozie/conf',
+ properties = self.getConfig()['configurations']['oozie-log4j'],
+ )
self.assertResourceCalled('File', '/etc/oozie/conf/adminusers.txt',
owner = 'oozie',
group = 'hadoop',
http://git-wip-us.apache.org/repos/asf/ambari/blob/1367ceb2/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 8e35e23..6b438a6 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
@@ -138,6 +138,13 @@ class TestOozieServer(RMFTestCase):
self.assertResourceCalled('TemplateConfig', '/etc/oozie/conf/oozie-env.sh',
owner = 'oozie',
)
+ self.assertResourceCalled('PropertiesFile', 'oozie-log4j.properties',
+ owner = 'oozie',
+ group = 'hadoop',
+ mode = 0664,
+ dir = '/etc/oozie/conf',
+ properties = self.getConfig()['configurations']['oozie-log4j'],
+ )
self.assertResourceCalled('File', '/etc/oozie/conf/adminusers.txt',
owner = 'oozie',
group = 'hadoop',
@@ -231,6 +238,13 @@ class TestOozieServer(RMFTestCase):
self.assertResourceCalled('TemplateConfig', '/etc/oozie/conf/oozie-env.sh',
owner = 'oozie',
)
+ self.assertResourceCalled('PropertiesFile', 'oozie-log4j.properties',
+ owner = 'oozie',
+ group = 'hadoop',
+ mode = 0664,
+ dir = '/etc/oozie/conf',
+ properties = self.getConfig()['configurations']['oozie-log4j'],
+ )
self.assertResourceCalled('File', '/etc/oozie/conf/adminusers.txt',
owner = 'oozie',
group = 'hadoop',
http://git-wip-us.apache.org/repos/asf/ambari/blob/1367ceb2/ambari-server/src/test/python/stacks/2.0.6/configs/default.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.0.6/configs/default.json b/ambari-server/src/test/python/stacks/2.0.6/configs/default.json
index 5405b87..21d29bb 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/configs/default.json
+++ b/ambari-server/src/test/python/stacks/2.0.6/configs/default.json
@@ -510,6 +510,9 @@
},
"pig-log4j": {
"property1": "value1"
+ },
+ "oozie-log4j": {
+ "property1": "value1"
}
},
"configurationTags": {
http://git-wip-us.apache.org/repos/asf/ambari/blob/1367ceb2/ambari-server/src/test/python/stacks/2.0.6/configs/secured.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.0.6/configs/secured.json b/ambari-server/src/test/python/stacks/2.0.6/configs/secured.json
index 81da171..758fe0b 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/configs/secured.json
+++ b/ambari-server/src/test/python/stacks/2.0.6/configs/secured.json
@@ -637,6 +637,9 @@
},
"pig-log4j": {
"property1": "value1"
+ },
+ "oozie-log4j": {
+ "property1": "value1"
}
},
"configurationTags": {