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 2016/03/11 18:06:39 UTC
[2/2] ambari git commit: AMBARI-15228. Ambari overwrites permissions
on HDFS directories (aonishuk)
AMBARI-15228. Ambari overwrites permissions on HDFS directories (aonishuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/4277dbe8
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/4277dbe8
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/4277dbe8
Branch: refs/heads/branch-2.2
Commit: 4277dbe8e356b309f6e1ecb98e1ddffb974e4692
Parents: b400a05
Author: Andrew Onishuk <ao...@hortonworks.com>
Authored: Fri Mar 11 19:06:29 2016 +0200
Committer: Andrew Onishuk <ao...@hortonworks.com>
Committed: Fri Mar 11 19:06:29 2016 +0200
----------------------------------------------------------------------
.../HDP/2.0.6/configuration/cluster-env.xml | 1 +
.../AMBARI_METRICS/test_metrics_collector.py | 7 +--
.../stacks/2.0.6/HBASE/test_hbase_master.py | 19 +++----
.../python/stacks/2.0.6/HDFS/test_namenode.py | 55 ++++++++++----------
.../stacks/2.0.6/HDFS/test_service_check.py | 9 ++--
.../stacks/2.0.6/HIVE/test_hive_server.py | 29 ++++++-----
.../2.0.6/HIVE/test_hive_service_check.py | 13 ++---
.../stacks/2.0.6/OOZIE/test_oozie_server.py | 33 ++++++------
.../stacks/2.0.6/OOZIE/test_service_check.py | 11 ++--
.../stacks/2.0.6/PIG/test_pig_service_check.py | 15 +++---
.../stacks/2.0.6/YARN/test_historyserver.py | 33 ++++++------
.../2.0.6/YARN/test_mapreduce2_service_check.py | 13 ++---
.../stacks/2.1/FALCON/test_falcon_server.py | 13 ++---
.../python/stacks/2.1/TEZ/test_service_check.py | 17 +++---
.../stacks/2.1/YARN/test_apptimelineserver.py | 3 +-
.../stacks/2.2/PIG/test_pig_service_check.py | 13 ++---
.../stacks/2.2/SPARK/test_job_history_server.py | 13 ++---
.../python/stacks/2.3/HAWQ/test_hawqmaster.py | 5 ++
.../2.3/MAHOUT/test_mahout_service_check.py | 9 ++--
.../2.3/SPARK/test_spark_thrift_server.py | 5 +-
.../test/python/stacks/2.3/YARN/test_ats_1_5.py | 11 ++--
.../python/stacks/2.3/configs/hawq_default.json | 2 +
22 files changed, 178 insertions(+), 151 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/4277dbe8/ambari-server/src/main/resources/stacks/HDP/2.0.6/configuration/cluster-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/configuration/cluster-env.xml b/ambari-server/src/main/resources/stacks/HDP/2.0.6/configuration/cluster-env.xml
index 7a4aa35..d9e9bc3 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/configuration/cluster-env.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/configuration/cluster-env.xml
@@ -110,6 +110,7 @@ gpgcheck=0</value>
Resource from this list will be managed even if it is marked as not managed in the stack</description>
<value-attributes>
<overridable>false</overridable>
+ <empty-value-valid>true</empty-value-valid>
</value-attributes>
</property>
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/4277dbe8/ambari-server/src/test/python/stacks/2.0.6/AMBARI_METRICS/test_metrics_collector.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.0.6/AMBARI_METRICS/test_metrics_collector.py b/ambari-server/src/test/python/stacks/2.0.6/AMBARI_METRICS/test_metrics_collector.py
index e461421..30c0ac6 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/AMBARI_METRICS/test_metrics_collector.py
+++ b/ambari-server/src/test/python/stacks/2.0.6/AMBARI_METRICS/test_metrics_collector.py
@@ -27,6 +27,7 @@ from stacks.utils.RMFTestCase import *
class TestMetricsCollector(RMFTestCase):
COMMON_SERVICES_PACKAGE_DIR = "AMBARI_METRICS/0.1.0/package"
STACK_VERSION = "2.0.6"
+ DEFAULT_IMMUTABLE_PATHS = ['/apps/hive/warehouse', '/apps/falcon', '/mr-history/done', '/app-logs', '/tmp']
def test_start_default_distributed(self):
self.executeScript(self.COMMON_SERVICES_PACKAGE_DIR + "/scripts/metrics_collector.py",
@@ -320,7 +321,7 @@ class TestMetricsCollector(RMFTestCase):
if name == 'master':
if distributed:
self.assertResourceCalled('HdfsResource', 'hdfs://localhost:8020/apps/hbase/data',
- immutable_paths = ['/apps/hive/warehouse', '/apps/falcon', '/mr-history/done', '/app-logs', '/tmp'],
+ immutable_paths = self.DEFAULT_IMMUTABLE_PATHS,
security_enabled = False,
hadoop_bin_dir = '/usr/bin',
keytab = UnknownConfigurationMock(),
@@ -336,7 +337,7 @@ class TestMetricsCollector(RMFTestCase):
default_fs='hdfs://c6401.ambari.apache.org:8020',
)
self.assertResourceCalled('HdfsResource', '/amshbase/staging',
- immutable_paths = ['/apps/hive/warehouse', '/apps/falcon', '/mr-history/done', '/app-logs', '/tmp'],
+ immutable_paths = self.DEFAULT_IMMUTABLE_PATHS,
security_enabled = False,
hadoop_bin_dir = '/usr/bin',
keytab = UnknownConfigurationMock(),
@@ -352,7 +353,7 @@ class TestMetricsCollector(RMFTestCase):
default_fs='hdfs://c6401.ambari.apache.org:8020',
)
self.assertResourceCalled('HdfsResource', None,
- immutable_paths = ['/apps/hive/warehouse', '/apps/falcon', '/mr-history/done', '/app-logs', '/tmp'],
+ immutable_paths = self.DEFAULT_IMMUTABLE_PATHS,
security_enabled = False,
hadoop_bin_dir = '/usr/bin',
keytab = UnknownConfigurationMock(),
http://git-wip-us.apache.org/repos/asf/ambari/blob/4277dbe8/ambari-server/src/test/python/stacks/2.0.6/HBASE/test_hbase_master.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.0.6/HBASE/test_hbase_master.py b/ambari-server/src/test/python/stacks/2.0.6/HBASE/test_hbase_master.py
index 1e9255c..2401df3 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/HBASE/test_hbase_master.py
+++ b/ambari-server/src/test/python/stacks/2.0.6/HBASE/test_hbase_master.py
@@ -27,6 +27,7 @@ class TestHBaseMaster(RMFTestCase):
COMMON_SERVICES_PACKAGE_DIR = "HBASE/0.96.0.2.0/package"
STACK_VERSION = "2.0.6"
TMP_PATH = "/hadoop"
+ DEFAULT_IMMUTABLE_PATHS = ['/apps/hive/warehouse', '/apps/falcon', '/mr-history/done', '/app-logs', '/tmp']
def test_install_hbase_master_default_no_phx(self):
self.executeScript(self.COMMON_SERVICES_PACKAGE_DIR + "/scripts/hbase_master.py",
@@ -329,7 +330,7 @@ class TestHBaseMaster(RMFTestCase):
)
self.assertResourceCalled('HdfsResource', 'hdfs://c6401.ambari.apache.org:8020/apps/hbase/data',
- immutable_paths = ['/apps/hive/warehouse', '/apps/falcon', '/mr-history/done', '/app-logs', '/tmp'],
+ immutable_paths = self.DEFAULT_IMMUTABLE_PATHS,
security_enabled = False,
hadoop_bin_dir = '/usr/bin',
keytab = UnknownConfigurationMock(),
@@ -342,7 +343,7 @@ class TestHBaseMaster(RMFTestCase):
action = ['create_on_execute'], hdfs_resource_ignore_file='/var/lib/ambari-agent/data/.hdfs_resource_ignore', hdfs_site=self.getConfig()['configurations']['hdfs-site'], principal_name=UnknownConfigurationMock(), default_fs='hdfs://c6401.ambari.apache.org:8020',
)
self.assertResourceCalled('HdfsResource', '/apps/hbase/staging',
- immutable_paths = ['/apps/hive/warehouse', '/apps/falcon', '/mr-history/done', '/app-logs', '/tmp'],
+ immutable_paths = self.DEFAULT_IMMUTABLE_PATHS,
security_enabled = False,
hadoop_conf_dir = '/etc/hadoop/conf',
keytab = UnknownConfigurationMock(),
@@ -356,7 +357,7 @@ class TestHBaseMaster(RMFTestCase):
mode = 0711,
)
self.assertResourceCalled('HdfsResource', None,
- immutable_paths = ['/apps/hive/warehouse', '/apps/falcon', '/mr-history/done', '/app-logs', '/tmp'],
+ immutable_paths = self.DEFAULT_IMMUTABLE_PATHS,
security_enabled = False,
hadoop_bin_dir = '/usr/bin',
keytab = UnknownConfigurationMock(),
@@ -467,7 +468,7 @@ class TestHBaseMaster(RMFTestCase):
content='log4jproperties\nline2'
)
self.assertResourceCalled('HdfsResource', 'hdfs://c6401.ambari.apache.org:8020/apps/hbase/data',
- immutable_paths = ['/apps/hive/warehouse', '/apps/falcon', '/mr-history/done', '/app-logs', '/tmp'],
+ immutable_paths = self.DEFAULT_IMMUTABLE_PATHS,
security_enabled = True,
hadoop_bin_dir = '/usr/bin',
keytab = '/etc/security/keytabs/hdfs.headless.keytab',
@@ -480,7 +481,7 @@ class TestHBaseMaster(RMFTestCase):
action = ['create_on_execute'], hdfs_resource_ignore_file='/var/lib/ambari-agent/data/.hdfs_resource_ignore', hdfs_site=self.getConfig()['configurations']['hdfs-site'], principal_name='hdfs', default_fs='hdfs://c6401.ambari.apache.org:8020',
)
self.assertResourceCalled('HdfsResource', '/apps/hbase/staging',
- immutable_paths = ['/apps/hive/warehouse', '/apps/falcon', '/mr-history/done', '/app-logs', '/tmp'],
+ immutable_paths = self.DEFAULT_IMMUTABLE_PATHS,
security_enabled = True,
hadoop_conf_dir = '/etc/hadoop/conf',
keytab = '/etc/security/keytabs/hdfs.headless.keytab',
@@ -494,7 +495,7 @@ class TestHBaseMaster(RMFTestCase):
mode = 0711,
)
self.assertResourceCalled('HdfsResource', None,
- immutable_paths = ['/apps/hive/warehouse', '/apps/falcon', '/mr-history/done', '/app-logs', '/tmp'],
+ immutable_paths = self.DEFAULT_IMMUTABLE_PATHS,
security_enabled = True,
hadoop_bin_dir = '/usr/bin',
keytab = '/etc/security/keytabs/hdfs.headless.keytab',
@@ -614,7 +615,7 @@ class TestHBaseMaster(RMFTestCase):
content='log4jproperties\nline2')
self.assertResourceCalled('HdfsResource', 'hdfs://nn1/apps/hbase/data',
- immutable_paths = ['/apps/hive/warehouse', '/apps/falcon', '/mr-history/done', '/app-logs', '/tmp'],
+ immutable_paths = self.DEFAULT_IMMUTABLE_PATHS,
security_enabled = False,
hadoop_bin_dir = '/usr/hdp/current/hadoop-client/bin',
keytab = UnknownConfigurationMock(),
@@ -629,7 +630,7 @@ class TestHBaseMaster(RMFTestCase):
action = ['create_on_execute'], hdfs_resource_ignore_file='/var/lib/ambari-agent/data/.hdfs_resource_ignore',
)
self.assertResourceCalled('HdfsResource', '/apps/hbase/staging',
- immutable_paths = ['/apps/hive/warehouse', '/apps/falcon', '/mr-history/done', '/app-logs', '/tmp'],
+ immutable_paths = self.DEFAULT_IMMUTABLE_PATHS,
security_enabled = False,
hadoop_bin_dir = '/usr/hdp/current/hadoop-client/bin',
keytab = UnknownConfigurationMock(),
@@ -645,7 +646,7 @@ class TestHBaseMaster(RMFTestCase):
mode = 0711,
)
self.assertResourceCalled('HdfsResource', None,
- immutable_paths = ['/apps/hive/warehouse', '/apps/falcon', '/mr-history/done', '/app-logs', '/tmp'],
+ immutable_paths = self.DEFAULT_IMMUTABLE_PATHS,
security_enabled = False,
hadoop_bin_dir = '/usr/hdp/current/hadoop-client/bin',
keytab = UnknownConfigurationMock(),
http://git-wip-us.apache.org/repos/asf/ambari/blob/4277dbe8/ambari-server/src/test/python/stacks/2.0.6/HDFS/test_namenode.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.0.6/HDFS/test_namenode.py b/ambari-server/src/test/python/stacks/2.0.6/HDFS/test_namenode.py
index 1d42e59..0520ce8 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/HDFS/test_namenode.py
+++ b/ambari-server/src/test/python/stacks/2.0.6/HDFS/test_namenode.py
@@ -32,6 +32,7 @@ from resource_management.core.exceptions import Fail
class TestNamenode(RMFTestCase):
COMMON_SERVICES_PACKAGE_DIR = "HDFS/2.1.0.2.0/package"
STACK_VERSION = "2.0.6"
+ DEFAULT_IMMUTABLE_PATHS = ['/apps/hive/warehouse', '/apps/falcon', '/mr-history/done', '/app-logs', '/tmp']
def test_configure_default(self):
self.executeScript(self.COMMON_SERVICES_PACKAGE_DIR + "/scripts/namenode.py",
@@ -95,7 +96,7 @@ class TestNamenode(RMFTestCase):
logoutput=True
)
self.assertResourceCalled('HdfsResource', '/tmp',
- immutable_paths = ['/apps/hive/warehouse', '/apps/falcon', '/mr-history/done', '/app-logs', '/tmp'],
+ immutable_paths = self.DEFAULT_IMMUTABLE_PATHS,
security_enabled = False,
only_if=True,
keytab = UnknownConfigurationMock(),
@@ -112,7 +113,7 @@ class TestNamenode(RMFTestCase):
mode = 0777,
)
self.assertResourceCalled('HdfsResource', '/user/ambari-qa',
- immutable_paths = ['/apps/hive/warehouse', '/apps/falcon', '/mr-history/done', '/app-logs', '/tmp'],
+ immutable_paths = self.DEFAULT_IMMUTABLE_PATHS,
security_enabled = False,
only_if=True,
keytab = UnknownConfigurationMock(),
@@ -129,7 +130,7 @@ class TestNamenode(RMFTestCase):
mode = 0770,
)
self.assertResourceCalled('HdfsResource', None,
- immutable_paths = ['/apps/hive/warehouse', '/apps/falcon', '/mr-history/done', '/app-logs', '/tmp'],
+ immutable_paths = self.DEFAULT_IMMUTABLE_PATHS,
security_enabled = False,
only_if=True,
keytab = UnknownConfigurationMock(),
@@ -208,7 +209,7 @@ class TestNamenode(RMFTestCase):
logoutput=True
)
self.assertResourceCalled('HdfsResource', '/tmp',
- immutable_paths = ['/apps/hive/warehouse', '/apps/falcon', '/mr-history/done', '/app-logs', '/tmp'],
+ immutable_paths = self.DEFAULT_IMMUTABLE_PATHS,
security_enabled = False,
only_if = True,
keytab = UnknownConfigurationMock(),
@@ -225,7 +226,7 @@ class TestNamenode(RMFTestCase):
mode = 0777,
)
self.assertResourceCalled('HdfsResource', '/user/ambari-qa',
- immutable_paths = ['/apps/hive/warehouse', '/apps/falcon', '/mr-history/done', '/app-logs', '/tmp'],
+ immutable_paths = self.DEFAULT_IMMUTABLE_PATHS,
security_enabled = False,
only_if = True,
keytab = UnknownConfigurationMock(),
@@ -242,7 +243,7 @@ class TestNamenode(RMFTestCase):
mode = 0770,
)
self.assertResourceCalled('HdfsResource', None,
- immutable_paths = ['/apps/hive/warehouse', '/apps/falcon', '/mr-history/done', '/app-logs', '/tmp'],
+ immutable_paths = self.DEFAULT_IMMUTABLE_PATHS,
security_enabled = False,
only_if = True,
keytab = UnknownConfigurationMock(),
@@ -337,7 +338,7 @@ class TestNamenode(RMFTestCase):
logoutput=True
)
self.assertResourceCalled('HdfsResource', '/tmp',
- immutable_paths = ['/apps/hive/warehouse', '/apps/falcon', '/mr-history/done', '/app-logs', '/tmp'],
+ immutable_paths = self.DEFAULT_IMMUTABLE_PATHS,
security_enabled = True,
hadoop_bin_dir = '/usr/bin',
keytab = '/etc/security/keytabs/hdfs.headless.keytab',
@@ -351,7 +352,7 @@ class TestNamenode(RMFTestCase):
only_if = True
)
self.assertResourceCalled('HdfsResource', '/user/ambari-qa',
- immutable_paths = ['/apps/hive/warehouse', '/apps/falcon', '/mr-history/done', '/app-logs', '/tmp'],
+ immutable_paths = self.DEFAULT_IMMUTABLE_PATHS,
security_enabled = True,
hadoop_bin_dir = '/usr/bin',
keytab = '/etc/security/keytabs/hdfs.headless.keytab',
@@ -365,7 +366,7 @@ class TestNamenode(RMFTestCase):
only_if = True
)
self.assertResourceCalled('HdfsResource', None,
- immutable_paths = ['/apps/hive/warehouse', '/apps/falcon', '/mr-history/done', '/app-logs', '/tmp'],
+ immutable_paths = self.DEFAULT_IMMUTABLE_PATHS,
security_enabled = True,
only_if = True,
keytab = '/etc/security/keytabs/hdfs.headless.keytab',
@@ -433,7 +434,7 @@ class TestNamenode(RMFTestCase):
logoutput=True
)
self.assertResourceCalled('HdfsResource', '/tmp',
- immutable_paths = ['/apps/hive/warehouse', '/apps/falcon', '/mr-history/done', '/app-logs', '/tmp'],
+ immutable_paths = self.DEFAULT_IMMUTABLE_PATHS,
security_enabled = False,
only_if = "ambari-sudo.sh su hdfs -l -s /bin/bash -c 'export PATH=/bin:/usr/bin ; hdfs --config /etc/hadoop/conf haadmin -getServiceState nn1 | grep active'",
keytab = UnknownConfigurationMock(),
@@ -450,7 +451,7 @@ class TestNamenode(RMFTestCase):
mode = 0777,
)
self.assertResourceCalled('HdfsResource', '/user/ambari-qa',
- immutable_paths = ['/apps/hive/warehouse', '/apps/falcon', '/mr-history/done', '/app-logs', '/tmp'],
+ immutable_paths = self.DEFAULT_IMMUTABLE_PATHS,
security_enabled = False,
only_if = "ambari-sudo.sh su hdfs -l -s /bin/bash -c 'export PATH=/bin:/usr/bin ; hdfs --config /etc/hadoop/conf haadmin -getServiceState nn1 | grep active'",
keytab = UnknownConfigurationMock(),
@@ -467,7 +468,7 @@ class TestNamenode(RMFTestCase):
mode = 0770,
)
self.assertResourceCalled('HdfsResource', None,
- immutable_paths = ['/apps/hive/warehouse', '/apps/falcon', '/mr-history/done', '/app-logs', '/tmp'],
+ immutable_paths = self.DEFAULT_IMMUTABLE_PATHS,
security_enabled = False,
only_if = "ambari-sudo.sh su hdfs -l -s /bin/bash -c 'export PATH=/bin:/usr/bin ; hdfs --config /etc/hadoop/conf haadmin -getServiceState nn1 | grep active'",
keytab = UnknownConfigurationMock(),
@@ -530,7 +531,7 @@ class TestNamenode(RMFTestCase):
logoutput=True
)
self.assertResourceCalled('HdfsResource', '/tmp',
- immutable_paths = ['/apps/hive/warehouse', '/apps/falcon', '/mr-history/done', '/app-logs', '/tmp'],
+ immutable_paths = self.DEFAULT_IMMUTABLE_PATHS,
security_enabled = False,
only_if = "ambari-sudo.sh su hdfs -l -s /bin/bash -c 'export PATH=/bin:/usr/bin ; hdfs --config /etc/hadoop/conf haadmin -getServiceState nn1 | grep active'",
keytab = UnknownConfigurationMock(),
@@ -547,7 +548,7 @@ class TestNamenode(RMFTestCase):
mode = 0777,
)
self.assertResourceCalled('HdfsResource', '/user/ambari-qa',
- immutable_paths = ['/apps/hive/warehouse', '/apps/falcon', '/mr-history/done', '/app-logs', '/tmp'],
+ immutable_paths = self.DEFAULT_IMMUTABLE_PATHS,
security_enabled = False,
only_if = "ambari-sudo.sh su hdfs -l -s /bin/bash -c 'export PATH=/bin:/usr/bin ; hdfs --config /etc/hadoop/conf haadmin -getServiceState nn1 | grep active'",
keytab = UnknownConfigurationMock(),
@@ -564,7 +565,7 @@ class TestNamenode(RMFTestCase):
mode = 0770,
)
self.assertResourceCalled('HdfsResource', None,
- immutable_paths = ['/apps/hive/warehouse', '/apps/falcon', '/mr-history/done', '/app-logs', '/tmp'],
+ immutable_paths = self.DEFAULT_IMMUTABLE_PATHS,
security_enabled = False,
only_if = "ambari-sudo.sh su hdfs -l -s /bin/bash -c 'export PATH=/bin:/usr/bin ; hdfs --config /etc/hadoop/conf haadmin -getServiceState nn1 | grep active'",
keytab = UnknownConfigurationMock(),
@@ -633,7 +634,7 @@ class TestNamenode(RMFTestCase):
logoutput=True
)
self.assertResourceCalled('HdfsResource', '/tmp',
- immutable_paths = ['/apps/hive/warehouse', '/apps/falcon', '/mr-history/done', '/app-logs', '/tmp'],
+ immutable_paths = self.DEFAULT_IMMUTABLE_PATHS,
security_enabled = True,
only_if = "ambari-sudo.sh su hdfs -l -s /bin/bash -c 'export PATH=/bin:/usr/bin ; hdfs --config /etc/hadoop/conf haadmin -getServiceState nn1 | grep active'",
keytab = '/etc/security/keytabs/hdfs.headless.keytab',
@@ -650,7 +651,7 @@ class TestNamenode(RMFTestCase):
mode = 0777,
)
self.assertResourceCalled('HdfsResource', '/user/ambari-qa',
- immutable_paths = ['/apps/hive/warehouse', '/apps/falcon', '/mr-history/done', '/app-logs', '/tmp'],
+ immutable_paths = self.DEFAULT_IMMUTABLE_PATHS,
security_enabled = True,
only_if = "ambari-sudo.sh su hdfs -l -s /bin/bash -c 'export PATH=/bin:/usr/bin ; hdfs --config /etc/hadoop/conf haadmin -getServiceState nn1 | grep active'",
keytab = '/etc/security/keytabs/hdfs.headless.keytab',
@@ -667,7 +668,7 @@ class TestNamenode(RMFTestCase):
mode = 0770,
)
self.assertResourceCalled('HdfsResource', None,
- immutable_paths = ['/apps/hive/warehouse', '/apps/falcon', '/mr-history/done', '/app-logs', '/tmp'],
+ immutable_paths = self.DEFAULT_IMMUTABLE_PATHS,
security_enabled = True,
only_if = "ambari-sudo.sh su hdfs -l -s /bin/bash -c 'export PATH=/bin:/usr/bin ; hdfs --config /etc/hadoop/conf haadmin -getServiceState nn1 | grep active'",
keytab = '/etc/security/keytabs/hdfs.headless.keytab',
@@ -736,7 +737,7 @@ class TestNamenode(RMFTestCase):
logoutput=True
)
self.assertResourceCalled('HdfsResource', '/tmp',
- immutable_paths = ['/apps/hive/warehouse', '/apps/falcon', '/mr-history/done', '/app-logs', '/tmp'],
+ immutable_paths = self.DEFAULT_IMMUTABLE_PATHS,
security_enabled = False,
only_if = "ambari-sudo.sh su hdfs -l -s /bin/bash -c 'export PATH=/bin:/usr/bin ; hdfs --config /etc/hadoop/conf haadmin -getServiceState nn1 | grep active'",
keytab = UnknownConfigurationMock(),
@@ -753,7 +754,7 @@ class TestNamenode(RMFTestCase):
mode = 0777,
)
self.assertResourceCalled('HdfsResource', '/user/ambari-qa',
- immutable_paths = ['/apps/hive/warehouse', '/apps/falcon', '/mr-history/done', '/app-logs', '/tmp'],
+ immutable_paths = self.DEFAULT_IMMUTABLE_PATHS,
security_enabled = False,
only_if = "ambari-sudo.sh su hdfs -l -s /bin/bash -c 'export PATH=/bin:/usr/bin ; hdfs --config /etc/hadoop/conf haadmin -getServiceState nn1 | grep active'",
keytab = UnknownConfigurationMock(),
@@ -770,7 +771,7 @@ class TestNamenode(RMFTestCase):
mode = 0770,
)
self.assertResourceCalled('HdfsResource', None,
- immutable_paths = ['/apps/hive/warehouse', '/apps/falcon', '/mr-history/done', '/app-logs', '/tmp'],
+ immutable_paths = self.DEFAULT_IMMUTABLE_PATHS,
security_enabled = False,
only_if = "ambari-sudo.sh su hdfs -l -s /bin/bash -c 'export PATH=/bin:/usr/bin ; hdfs --config /etc/hadoop/conf haadmin -getServiceState nn1 | grep active'",
keytab = UnknownConfigurationMock(),
@@ -838,7 +839,7 @@ class TestNamenode(RMFTestCase):
logoutput=True
)
self.assertResourceCalled('HdfsResource', '/tmp',
- immutable_paths = ['/apps/hive/warehouse', '/apps/falcon', '/mr-history/done', '/app-logs', '/tmp'],
+ immutable_paths = self.DEFAULT_IMMUTABLE_PATHS,
security_enabled = False,
only_if = "ambari-sudo.sh su hdfs -l -s /bin/bash -c 'export PATH=/bin:/usr/bin ; hdfs --config /etc/hadoop/conf haadmin -getServiceState nn2 | grep active'",
keytab = UnknownConfigurationMock(),
@@ -855,7 +856,7 @@ class TestNamenode(RMFTestCase):
mode = 0777,
)
self.assertResourceCalled('HdfsResource', '/user/ambari-qa',
- immutable_paths = ['/apps/hive/warehouse', '/apps/falcon', '/mr-history/done', '/app-logs', '/tmp'],
+ immutable_paths = self.DEFAULT_IMMUTABLE_PATHS,
security_enabled = False,
only_if = "ambari-sudo.sh su hdfs -l -s /bin/bash -c 'export PATH=/bin:/usr/bin ; hdfs --config /etc/hadoop/conf haadmin -getServiceState nn2 | grep active'",
keytab = UnknownConfigurationMock(),
@@ -872,7 +873,7 @@ class TestNamenode(RMFTestCase):
mode = 0770,
)
self.assertResourceCalled('HdfsResource', None,
- immutable_paths = ['/apps/hive/warehouse', '/apps/falcon', '/mr-history/done', '/app-logs', '/tmp'],
+ immutable_paths = self.DEFAULT_IMMUTABLE_PATHS,
security_enabled = False,
only_if = "ambari-sudo.sh su hdfs -l -s /bin/bash -c 'export PATH=/bin:/usr/bin ; hdfs --config /etc/hadoop/conf haadmin -getServiceState nn2 | grep active'",
keytab = UnknownConfigurationMock(),
@@ -948,7 +949,7 @@ class TestNamenode(RMFTestCase):
logoutput=True
)
self.assertResourceCalled('HdfsResource', '/tmp',
- immutable_paths = ['/apps/hive/warehouse', '/apps/falcon', '/mr-history/done', '/app-logs', '/tmp'],
+ immutable_paths = self.DEFAULT_IMMUTABLE_PATHS,
security_enabled = False,
only_if = "ambari-sudo.sh su hdfs -l -s /bin/bash -c 'export PATH=/bin:/usr/bin ; hdfs --config /etc/hadoop/conf haadmin -getServiceState nn2 | grep active'",
keytab = UnknownConfigurationMock(),
@@ -965,7 +966,7 @@ class TestNamenode(RMFTestCase):
mode = 0777,
)
self.assertResourceCalled('HdfsResource', '/user/ambari-qa',
- immutable_paths = ['/apps/hive/warehouse', '/apps/falcon', '/mr-history/done', '/app-logs', '/tmp'],
+ immutable_paths = self.DEFAULT_IMMUTABLE_PATHS,
security_enabled = False,
only_if = "ambari-sudo.sh su hdfs -l -s /bin/bash -c 'export PATH=/bin:/usr/bin ; hdfs --config /etc/hadoop/conf haadmin -getServiceState nn2 | grep active'",
keytab = UnknownConfigurationMock(),
@@ -982,7 +983,7 @@ class TestNamenode(RMFTestCase):
mode = 0770,
)
self.assertResourceCalled('HdfsResource', None,
- immutable_paths = ['/apps/hive/warehouse', '/apps/falcon', '/mr-history/done', '/app-logs', '/tmp'],
+ immutable_paths = self.DEFAULT_IMMUTABLE_PATHS,
security_enabled = False,
only_if = "ambari-sudo.sh su hdfs -l -s /bin/bash -c 'export PATH=/bin:/usr/bin ; hdfs --config /etc/hadoop/conf haadmin -getServiceState nn2 | grep active'",
keytab = UnknownConfigurationMock(),
http://git-wip-us.apache.org/repos/asf/ambari/blob/4277dbe8/ambari-server/src/test/python/stacks/2.0.6/HDFS/test_service_check.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.0.6/HDFS/test_service_check.py b/ambari-server/src/test/python/stacks/2.0.6/HDFS/test_service_check.py
index 0d8226a..10140f9 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/HDFS/test_service_check.py
+++ b/ambari-server/src/test/python/stacks/2.0.6/HDFS/test_service_check.py
@@ -25,6 +25,7 @@ from mock.mock import MagicMock, call, patch
class TestServiceCheck(RMFTestCase):
COMMON_SERVICES_PACKAGE_DIR = "HDFS/2.1.0.2.0/package"
STACK_VERSION = "2.0.6"
+ DEFAULT_IMMUTABLE_PATHS = ['/apps/hive/warehouse', '/apps/falcon', '/mr-history/done', '/app-logs', '/tmp']
def test_service_check_default(self):
self.executeScript(self.COMMON_SERVICES_PACKAGE_DIR + "/scripts/service_check.py",
@@ -60,7 +61,7 @@ class TestServiceCheck(RMFTestCase):
user = 'hdfs',
)
self.assertResourceCalled('HdfsResource', '/tmp',
- immutable_paths = ['/apps/hive/warehouse', '/apps/falcon', '/mr-history/done', '/app-logs', '/tmp'],
+ immutable_paths = self.DEFAULT_IMMUTABLE_PATHS,
security_enabled = False,
hadoop_bin_dir = '/usr/bin',
keytab = UnknownConfigurationMock(),
@@ -75,7 +76,7 @@ class TestServiceCheck(RMFTestCase):
mode = 0777,
)
self.assertResourceCalled('HdfsResource', '/tmp/',
- immutable_paths = ['/apps/hive/warehouse', '/apps/falcon', '/mr-history/done', '/app-logs', '/tmp'],
+ immutable_paths = self.DEFAULT_IMMUTABLE_PATHS,
security_enabled = False,
hadoop_bin_dir = '/usr/bin',
keytab = UnknownConfigurationMock(),
@@ -89,7 +90,7 @@ class TestServiceCheck(RMFTestCase):
type = 'file',
)
self.assertResourceCalled('HdfsResource', '/tmp/',
- immutable_paths = ['/apps/hive/warehouse', '/apps/falcon', '/mr-history/done', '/app-logs', '/tmp'],
+ immutable_paths = self.DEFAULT_IMMUTABLE_PATHS,
security_enabled = False,
hadoop_bin_dir = '/usr/bin',
keytab = UnknownConfigurationMock(),
@@ -104,7 +105,7 @@ class TestServiceCheck(RMFTestCase):
type = 'file',
)
self.assertResourceCalled('HdfsResource', None,
- immutable_paths = ['/apps/hive/warehouse', '/apps/falcon', '/mr-history/done', '/app-logs', '/tmp'],
+ immutable_paths = self.DEFAULT_IMMUTABLE_PATHS,
security_enabled = False,
hadoop_bin_dir = '/usr/bin',
keytab = UnknownConfigurationMock(),
http://git-wip-us.apache.org/repos/asf/ambari/blob/4277dbe8/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 79dbc9c..641d6f9 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
@@ -38,6 +38,7 @@ class TestHiveServer(RMFTestCase):
COMMON_SERVICES_PACKAGE_DIR = "HIVE/0.12.0.2.0/package"
STACK_VERSION = "2.0.6"
UPGRADE_STACK_VERSION = "2.2"
+ DEFAULT_IMMUTABLE_PATHS = ['/apps/hive/warehouse', '/apps/falcon', '/mr-history/done', '/app-logs', '/tmp']
def setUp(self):
Logger.logger = MagicMock()
@@ -331,7 +332,7 @@ class TestHiveServer(RMFTestCase):
def assert_configure_default(self, no_tmp = False, default_fs_default='hdfs://c6401.ambari.apache.org:8020'):
# Verify creating of Hcat and Hive directories
self.assertResourceCalled('HdfsResource', '/apps/webhcat',
- immutable_paths = ['/apps/hive/warehouse', '/apps/falcon', '/mr-history/done', '/app-logs', '/tmp'],
+ immutable_paths = self.DEFAULT_IMMUTABLE_PATHS,
security_enabled = False,
hadoop_bin_dir = '/usr/bin',
keytab = UnknownConfigurationMock(),
@@ -344,7 +345,7 @@ class TestHiveServer(RMFTestCase):
mode = 0755,
)
self.assertResourceCalled('HdfsResource', '/user/hcat',
- immutable_paths = ['/apps/hive/warehouse', '/apps/falcon', '/mr-history/done', '/app-logs', '/tmp'],
+ immutable_paths = self.DEFAULT_IMMUTABLE_PATHS,
security_enabled = False,
hadoop_bin_dir = '/usr/bin',
keytab = UnknownConfigurationMock(),
@@ -362,7 +363,7 @@ class TestHiveServer(RMFTestCase):
return
self.assertResourceCalled('HdfsResource', '/apps/hive/warehouse',
- immutable_paths = ['/apps/hive/warehouse', '/apps/falcon', '/mr-history/done', '/app-logs', '/tmp'],
+ immutable_paths = self.DEFAULT_IMMUTABLE_PATHS,
security_enabled = False,
hadoop_bin_dir = '/usr/bin',
keytab = UnknownConfigurationMock(),
@@ -375,7 +376,7 @@ class TestHiveServer(RMFTestCase):
mode = 0777,
)
self.assertResourceCalled('HdfsResource', '/user/hive',
- immutable_paths = ['/apps/hive/warehouse', '/apps/falcon', '/mr-history/done', '/app-logs', '/tmp'],
+ immutable_paths = self.DEFAULT_IMMUTABLE_PATHS,
security_enabled = False,
hadoop_bin_dir = '/usr/bin',
keytab = UnknownConfigurationMock(),
@@ -389,7 +390,7 @@ class TestHiveServer(RMFTestCase):
)
if not no_tmp:
self.assertResourceCalled('HdfsResource', '/custompath/tmp/hive',
- immutable_paths = ['/apps/hive/warehouse', '/apps/falcon', '/mr-history/done', '/app-logs', '/tmp'],
+ immutable_paths = self.DEFAULT_IMMUTABLE_PATHS,
security_enabled = False,
hadoop_conf_dir = '/etc/hadoop/conf',
keytab = UnknownConfigurationMock(),
@@ -403,7 +404,7 @@ class TestHiveServer(RMFTestCase):
mode = 0777,
)
self.assertResourceCalled('HdfsResource', None,
- immutable_paths = ['/apps/hive/warehouse', '/apps/falcon', '/mr-history/done', '/app-logs', '/tmp'],
+ immutable_paths = self.DEFAULT_IMMUTABLE_PATHS,
security_enabled = False,
hadoop_bin_dir = '/usr/bin',
keytab = UnknownConfigurationMock(),
@@ -519,7 +520,7 @@ class TestHiveServer(RMFTestCase):
def assert_configure_secured(self):
self.assertResourceCalled('HdfsResource', '/apps/webhcat',
- immutable_paths = ['/apps/hive/warehouse', '/apps/falcon', '/mr-history/done', '/app-logs', '/tmp'],
+ immutable_paths = self.DEFAULT_IMMUTABLE_PATHS,
security_enabled = True,
hadoop_bin_dir = '/usr/bin',
keytab = '/etc/security/keytabs/hdfs.headless.keytab',
@@ -532,7 +533,7 @@ class TestHiveServer(RMFTestCase):
mode = 0755,
)
self.assertResourceCalled('HdfsResource', '/user/hcat',
- immutable_paths = ['/apps/hive/warehouse', '/apps/falcon', '/mr-history/done', '/app-logs', '/tmp'],
+ immutable_paths = self.DEFAULT_IMMUTABLE_PATHS,
security_enabled = True,
hadoop_bin_dir = '/usr/bin',
keytab = '/etc/security/keytabs/hdfs.headless.keytab',
@@ -546,7 +547,7 @@ class TestHiveServer(RMFTestCase):
)
self.assertResourceCalled('HdfsResource', '/apps/hive/warehouse',
- immutable_paths = ['/apps/hive/warehouse', '/apps/falcon', '/mr-history/done', '/app-logs', '/tmp'],
+ immutable_paths = self.DEFAULT_IMMUTABLE_PATHS,
security_enabled = True,
hadoop_bin_dir = '/usr/bin',
keytab = '/etc/security/keytabs/hdfs.headless.keytab',
@@ -559,7 +560,7 @@ class TestHiveServer(RMFTestCase):
mode = 0777,
)
self.assertResourceCalled('HdfsResource', '/user/hive',
- immutable_paths = ['/apps/hive/warehouse', '/apps/falcon', '/mr-history/done', '/app-logs', '/tmp'],
+ immutable_paths = self.DEFAULT_IMMUTABLE_PATHS,
security_enabled = True,
hadoop_bin_dir = '/usr/bin',
keytab = '/etc/security/keytabs/hdfs.headless.keytab',
@@ -572,7 +573,7 @@ class TestHiveServer(RMFTestCase):
mode = 0755,
)
self.assertResourceCalled('HdfsResource', '/custompath/tmp/hive',
- immutable_paths = ['/apps/hive/warehouse', '/apps/falcon', '/mr-history/done', '/app-logs', '/tmp'],
+ immutable_paths = self.DEFAULT_IMMUTABLE_PATHS,
security_enabled = True,
hadoop_conf_dir = '/etc/hadoop/conf',
keytab = '/etc/security/keytabs/hdfs.headless.keytab',
@@ -586,7 +587,7 @@ class TestHiveServer(RMFTestCase):
mode = 0777,
)
self.assertResourceCalled('HdfsResource', None,
- immutable_paths = ['/apps/hive/warehouse', '/apps/falcon', '/mr-history/done', '/app-logs', '/tmp'],
+ immutable_paths = self.DEFAULT_IMMUTABLE_PATHS,
security_enabled = True,
hadoop_bin_dir = '/usr/bin',
keytab = '/etc/security/keytabs/hdfs.headless.keytab',
@@ -920,7 +921,7 @@ From source with checksum 150f554beae04f76f814f59549dead8b"""
copy_to_hdfs_mock.assert_any_call("tez", "hadoop", "hdfs", host_sys_prepped=False)
self.assertEquals(2, copy_to_hdfs_mock.call_count)
self.assertResourceCalled('HdfsResource', None,
- immutable_paths = ['/apps/hive/warehouse', '/apps/falcon', '/mr-history/done', '/app-logs', '/tmp'],
+ immutable_paths = self.DEFAULT_IMMUTABLE_PATHS,
security_enabled = False,
hadoop_bin_dir = '/usr/hdp/current/hadoop-client/bin',
keytab = UnknownConfigurationMock(),
@@ -962,7 +963,7 @@ From source with checksum 150f554beae04f76f814f59549dead8b"""
copy_to_hdfs_mock.assert_any_call("tez", "hadoop", "hdfs", host_sys_prepped=False)
self.assertEquals(2, copy_to_hdfs_mock.call_count)
self.assertResourceCalled('HdfsResource', None,
- immutable_paths = ['/apps/hive/warehouse', '/apps/falcon', '/mr-history/done', '/app-logs', '/tmp'],
+ immutable_paths = self.DEFAULT_IMMUTABLE_PATHS,
security_enabled = False,
hadoop_bin_dir = '/usr/hdp/current/hadoop-client/bin',
keytab = UnknownConfigurationMock(),
http://git-wip-us.apache.org/repos/asf/ambari/blob/4277dbe8/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 e9cd3c2..971cb8f 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
@@ -30,6 +30,7 @@ import resource_management.libraries.functions
class TestServiceCheck(RMFTestCase):
COMMON_SERVICES_PACKAGE_DIR = "HIVE/0.12.0.2.0/package"
STACK_VERSION = "2.0.6"
+ DEFAULT_IMMUTABLE_PATHS = ['/apps/hive/warehouse', '/apps/falcon', '/mr-history/done', '/app-logs', '/tmp']
def test_service_check_default(self, socket_mock):
@@ -90,7 +91,7 @@ class TestServiceCheck(RMFTestCase):
owner="hdfs"
)
self.assertResourceCalled('HdfsResource', '/tmp/idtest.ambari-qa.1431110511.43.pig',
- immutable_paths = ['/apps/hive/warehouse', '/apps/falcon', '/mr-history/done', '/app-logs', '/tmp'],
+ immutable_paths = self.DEFAULT_IMMUTABLE_PATHS,
security_enabled = False,
hadoop_bin_dir = '/usr/bin',
keytab = UnknownConfigurationMock(),
@@ -106,7 +107,7 @@ class TestServiceCheck(RMFTestCase):
action = ['create_on_execute'], hdfs_resource_ignore_file='/var/lib/ambari-agent/data/.hdfs_resource_ignore',
)
self.assertResourceCalled('HdfsResource', '/tmp/idtest.ambari-qa.1431110511.43.in',
- immutable_paths = ['/apps/hive/warehouse', '/apps/falcon', '/mr-history/done', '/app-logs', '/tmp'],
+ immutable_paths = self.DEFAULT_IMMUTABLE_PATHS,
security_enabled = False,
hadoop_bin_dir = '/usr/bin',
keytab = UnknownConfigurationMock(),
@@ -122,7 +123,7 @@ class TestServiceCheck(RMFTestCase):
action = ['create_on_execute'], hdfs_resource_ignore_file='/var/lib/ambari-agent/data/.hdfs_resource_ignore',
)
self.assertResourceCalled('HdfsResource', None,
- immutable_paths = ['/apps/hive/warehouse', '/apps/falcon', '/mr-history/done', '/app-logs', '/tmp'],
+ immutable_paths = self.DEFAULT_IMMUTABLE_PATHS,
security_enabled = False,
hadoop_bin_dir = '/usr/bin',
keytab = UnknownConfigurationMock(),
@@ -203,7 +204,7 @@ class TestServiceCheck(RMFTestCase):
owner = "hdfs"
)
self.assertResourceCalled('HdfsResource', '/tmp/idtest.ambari-qa.1431110511.43.pig',
- immutable_paths = ['/apps/hive/warehouse', '/apps/falcon', '/mr-history/done', '/app-logs', '/tmp'],
+ immutable_paths = self.DEFAULT_IMMUTABLE_PATHS,
security_enabled = True,
hadoop_bin_dir = '/usr/bin',
keytab = '/etc/security/keytabs/hdfs.headless.keytab',
@@ -219,7 +220,7 @@ class TestServiceCheck(RMFTestCase):
action = ['create_on_execute'], hdfs_resource_ignore_file='/var/lib/ambari-agent/data/.hdfs_resource_ignore',
)
self.assertResourceCalled('HdfsResource', '/tmp/idtest.ambari-qa.1431110511.43.in',
- immutable_paths = ['/apps/hive/warehouse', '/apps/falcon', '/mr-history/done', '/app-logs', '/tmp'],
+ immutable_paths = self.DEFAULT_IMMUTABLE_PATHS,
security_enabled = True,
hadoop_bin_dir = '/usr/bin',
keytab = '/etc/security/keytabs/hdfs.headless.keytab',
@@ -235,7 +236,7 @@ class TestServiceCheck(RMFTestCase):
action = ['create_on_execute'], hdfs_resource_ignore_file='/var/lib/ambari-agent/data/.hdfs_resource_ignore',
)
self.assertResourceCalled('HdfsResource', None,
- immutable_paths = ['/apps/hive/warehouse', '/apps/falcon', '/mr-history/done', '/app-logs', '/tmp'],
+ immutable_paths = self.DEFAULT_IMMUTABLE_PATHS,
security_enabled = True,
hadoop_bin_dir = '/usr/bin',
keytab = '/etc/security/keytabs/hdfs.headless.keytab',
http://git-wip-us.apache.org/repos/asf/ambari/blob/4277dbe8/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 81d7faa..d6a5c89 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
@@ -34,6 +34,7 @@ class TestOozieServer(RMFTestCase):
COMMON_SERVICES_PACKAGE_DIR = "OOZIE/4.0.0.2.0/package"
STACK_VERSION = "2.0.6"
UPGRADE_STACK_VERSION = "2.2"
+ DEFAULT_IMMUTABLE_PATHS = ['/apps/hive/warehouse', '/apps/falcon', '/mr-history/done', '/app-logs', '/tmp']
def setUp(self):
self.maxDiff = None
@@ -64,7 +65,7 @@ class TestOozieServer(RMFTestCase):
call_mocks = call_mocks
)
self.assertResourceCalled('HdfsResource', '/user/oozie',
- immutable_paths = ['/apps/hive/warehouse', '/apps/falcon', '/mr-history/done', '/app-logs', '/tmp'],
+ immutable_paths = self.DEFAULT_IMMUTABLE_PATHS,
security_enabled = False,
hadoop_bin_dir = '/usr/bin',
keytab = UnknownConfigurationMock(),
@@ -77,7 +78,7 @@ class TestOozieServer(RMFTestCase):
mode = 0775,
)
self.assertResourceCalled('HdfsResource', None,
- immutable_paths = ['/apps/hive/warehouse', '/apps/falcon', '/mr-history/done', '/app-logs', '/tmp'],
+ immutable_paths = self.DEFAULT_IMMUTABLE_PATHS,
security_enabled = False,
hadoop_bin_dir = '/usr/bin',
keytab = UnknownConfigurationMock(),
@@ -275,7 +276,7 @@ class TestOozieServer(RMFTestCase):
call_mocks = call_mocks
)
self.assertResourceCalled('HdfsResource', '/user/oozie',
- immutable_paths = ['/apps/hive/warehouse', '/apps/falcon', '/mr-history/done', '/app-logs', '/tmp'],
+ immutable_paths = self.DEFAULT_IMMUTABLE_PATHS,
security_enabled = False,
hadoop_bin_dir = '/usr/bin',
keytab = UnknownConfigurationMock(),
@@ -291,7 +292,7 @@ class TestOozieServer(RMFTestCase):
mode = 0775,
)
self.assertResourceCalled('HdfsResource', None,
- immutable_paths = ['/apps/hive/warehouse', '/apps/falcon', '/mr-history/done', '/app-logs', '/tmp'],
+ immutable_paths = self.DEFAULT_IMMUTABLE_PATHS,
security_enabled = False,
hadoop_bin_dir = '/usr/bin',
keytab = UnknownConfigurationMock(),
@@ -503,7 +504,7 @@ class TestOozieServer(RMFTestCase):
user = 'oozie',
)
self.assertResourceCalled('HdfsResource', '/user/oozie/share',
- immutable_paths = ['/apps/hive/warehouse', '/apps/falcon', '/mr-history/done', '/app-logs', '/tmp'],
+ immutable_paths = self.DEFAULT_IMMUTABLE_PATHS,
security_enabled = False,
hadoop_bin_dir = '/usr/bin',
keytab = UnknownConfigurationMock(),
@@ -519,7 +520,7 @@ class TestOozieServer(RMFTestCase):
mode = 0755,
)
self.assertResourceCalled('HdfsResource', None,
- immutable_paths = ['/apps/hive/warehouse', '/apps/falcon', '/mr-history/done', '/app-logs', '/tmp'],
+ immutable_paths = self.DEFAULT_IMMUTABLE_PATHS,
security_enabled = False,
hadoop_bin_dir = '/usr/bin',
keytab = UnknownConfigurationMock(),
@@ -598,7 +599,7 @@ class TestOozieServer(RMFTestCase):
user = 'oozie',
)
self.assertResourceCalled('HdfsResource', '/user/oozie/share',
- immutable_paths = ['/apps/hive/warehouse', '/apps/falcon', '/mr-history/done', '/app-logs', '/tmp'],
+ immutable_paths = self.DEFAULT_IMMUTABLE_PATHS,
security_enabled = True,
hadoop_bin_dir = '/usr/bin',
keytab = '/etc/security/keytabs/hdfs.headless.keytab',
@@ -614,7 +615,7 @@ class TestOozieServer(RMFTestCase):
mode = 0755,
)
self.assertResourceCalled('HdfsResource', None,
- immutable_paths = ['/apps/hive/warehouse', '/apps/falcon', '/mr-history/done', '/app-logs', '/tmp'],
+ immutable_paths = self.DEFAULT_IMMUTABLE_PATHS,
security_enabled = True,
hadoop_bin_dir = '/usr/bin',
keytab = '/etc/security/keytabs/hdfs.headless.keytab',
@@ -653,7 +654,7 @@ class TestOozieServer(RMFTestCase):
def assert_configure_default(self):
self.assertResourceCalled('HdfsResource', '/user/oozie',
- immutable_paths = ['/apps/hive/warehouse', '/apps/falcon', '/mr-history/done', '/app-logs', '/tmp'],
+ immutable_paths = self.DEFAULT_IMMUTABLE_PATHS,
security_enabled = False,
hadoop_conf_dir = '/etc/hadoop/conf',
keytab = UnknownConfigurationMock(),
@@ -666,7 +667,7 @@ class TestOozieServer(RMFTestCase):
mode = 0775,
)
self.assertResourceCalled('HdfsResource', None,
- immutable_paths = ['/apps/hive/warehouse', '/apps/falcon', '/mr-history/done', '/app-logs', '/tmp'],
+ immutable_paths = self.DEFAULT_IMMUTABLE_PATHS,
security_enabled = False,
hadoop_bin_dir = '/usr/bin',
keytab = UnknownConfigurationMock(),
@@ -836,7 +837,7 @@ class TestOozieServer(RMFTestCase):
def assert_configure_secured(self):
self.assertResourceCalled('HdfsResource', '/user/oozie',
- immutable_paths = ['/apps/hive/warehouse', '/apps/falcon', '/mr-history/done', '/app-logs', '/tmp'],
+ immutable_paths = self.DEFAULT_IMMUTABLE_PATHS,
security_enabled = True,
hadoop_conf_dir = '/etc/hadoop/conf',
keytab = '/etc/security/keytabs/hdfs.headless.keytab',
@@ -850,7 +851,7 @@ class TestOozieServer(RMFTestCase):
mode = 0775,
)
self.assertResourceCalled('HdfsResource', None,
- immutable_paths = ['/apps/hive/warehouse', '/apps/falcon', '/mr-history/done', '/app-logs', '/tmp'],
+ immutable_paths = self.DEFAULT_IMMUTABLE_PATHS,
security_enabled = True,
hadoop_bin_dir = '/usr/bin',
keytab = '/etc/security/keytabs/hdfs.headless.keytab',
@@ -1379,7 +1380,7 @@ class TestOozieServer(RMFTestCase):
user = 'oozie', logoutput = True )
self.assertResourceCalled('HdfsResource', '/user/oozie/share',
- immutable_paths = ['/apps/hive/warehouse', '/apps/falcon', '/mr-history/done', '/app-logs', '/tmp'],
+ immutable_paths = self.DEFAULT_IMMUTABLE_PATHS,
security_enabled = False,
hadoop_bin_dir = '/usr/hdp/2.3.0.0-1234/hadoop/bin',
keytab = UnknownConfigurationMock(),
@@ -1397,7 +1398,7 @@ class TestOozieServer(RMFTestCase):
mode = 0755 )
self.assertResourceCalled('HdfsResource', None,
- immutable_paths = ['/apps/hive/warehouse', '/apps/falcon', '/mr-history/done', '/app-logs', '/tmp'],
+ immutable_paths = self.DEFAULT_IMMUTABLE_PATHS,
security_enabled = False,
hadoop_bin_dir = '/usr/hdp/2.3.0.0-1234/hadoop/bin',
keytab = UnknownConfigurationMock(),
@@ -1452,7 +1453,7 @@ class TestOozieServer(RMFTestCase):
user = 'oozie', logoutput = True )
self.assertResourceCalled('HdfsResource', '/user/oozie/share',
- immutable_paths = ['/apps/hive/warehouse', '/apps/falcon', '/mr-history/done', '/app-logs', '/tmp'],
+ immutable_paths = self.DEFAULT_IMMUTABLE_PATHS,
security_enabled = False,
hadoop_bin_dir = '/usr/hdp/2.3.0.0-1234/hadoop/bin',
keytab = UnknownConfigurationMock(),
@@ -1470,7 +1471,7 @@ class TestOozieServer(RMFTestCase):
mode = 0755 )
self.assertResourceCalled('HdfsResource', None,
- immutable_paths = ['/apps/hive/warehouse', '/apps/falcon', '/mr-history/done', '/app-logs', '/tmp'],
+ immutable_paths = self.DEFAULT_IMMUTABLE_PATHS,
security_enabled = False,
hadoop_bin_dir = '/usr/hdp/2.3.0.0-1234/hadoop/bin',
keytab = UnknownConfigurationMock(),
http://git-wip-us.apache.org/repos/asf/ambari/blob/4277dbe8/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 9024fc8..3d70f88 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
@@ -26,6 +26,7 @@ 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"
+ DEFAULT_IMMUTABLE_PATHS = ['/apps/hive/warehouse', '/apps/falcon', '/mr-history/done', '/app-logs', '/tmp']
def test_service_check_default(self):
self.executeScript(self.COMMON_SERVICES_PACKAGE_DIR + "/scripts/service_check.py",
@@ -83,7 +84,7 @@ class TestServiceCheck(RMFTestCase):
try_sleep = 5,
)
self.assertResourceCalled('HdfsResource', '/user/ambari-qa/examples',
- immutable_paths = ['/apps/hive/warehouse', '/apps/falcon', '/mr-history/done', '/app-logs', '/tmp'],
+ immutable_paths = self.DEFAULT_IMMUTABLE_PATHS,
security_enabled = False,
hadoop_bin_dir = '/usr/bin',
keytab = UnknownConfigurationMock(),
@@ -94,7 +95,7 @@ class TestServiceCheck(RMFTestCase):
type = 'directory',
)
self.assertResourceCalled('HdfsResource', '/user/ambari-qa/examples',
- immutable_paths = ['/apps/hive/warehouse', '/apps/falcon', '/mr-history/done', '/app-logs', '/tmp'],
+ immutable_paths = self.DEFAULT_IMMUTABLE_PATHS,
security_enabled = False,
hadoop_bin_dir = '/usr/bin',
keytab = UnknownConfigurationMock(),
@@ -108,7 +109,7 @@ class TestServiceCheck(RMFTestCase):
group = 'hadoop'
)
self.assertResourceCalled('HdfsResource', '/user/ambari-qa/input-data',
- immutable_paths = ['/apps/hive/warehouse', '/apps/falcon', '/mr-history/done', '/app-logs', '/tmp'],
+ immutable_paths = self.DEFAULT_IMMUTABLE_PATHS,
security_enabled = False,
hadoop_bin_dir = '/usr/bin',
keytab = UnknownConfigurationMock(),
@@ -119,7 +120,7 @@ class TestServiceCheck(RMFTestCase):
type = 'directory',
)
self.assertResourceCalled('HdfsResource', '/user/ambari-qa/input-data',
- immutable_paths = ['/apps/hive/warehouse', '/apps/falcon', '/mr-history/done', '/app-logs', '/tmp'],
+ immutable_paths = self.DEFAULT_IMMUTABLE_PATHS,
security_enabled = False,
hadoop_bin_dir = '/usr/bin',
keytab = UnknownConfigurationMock(),
@@ -133,7 +134,7 @@ class TestServiceCheck(RMFTestCase):
group = 'hadoop'
)
self.assertResourceCalled('HdfsResource', None,
- immutable_paths = ['/apps/hive/warehouse', '/apps/falcon', '/mr-history/done', '/app-logs', '/tmp'],
+ immutable_paths = self.DEFAULT_IMMUTABLE_PATHS,
security_enabled = False,
hadoop_bin_dir = '/usr/bin',
keytab = UnknownConfigurationMock(),
http://git-wip-us.apache.org/repos/asf/ambari/blob/4277dbe8/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 d3daae4..f81deb2 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
@@ -23,7 +23,8 @@ from stacks.utils.RMFTestCase import *
class TestPigServiceCheck(RMFTestCase):
COMMON_SERVICES_PACKAGE_DIR = "PIG/0.12.0.2.0/package"
STACK_VERSION = "2.0.6"
-
+ DEFAULT_IMMUTABLE_PATHS = ['/apps/hive/warehouse', '/apps/falcon', '/mr-history/done', '/app-logs', '/tmp']
+
def test_configure_default(self):
self.executeScript(self.COMMON_SERVICES_PACKAGE_DIR + "/scripts/service_check.py",
classname = "PigServiceCheck",
@@ -33,7 +34,7 @@ class TestPigServiceCheck(RMFTestCase):
target = RMFTestCase.TARGET_COMMON_SERVICES
)
self.assertResourceCalled('HdfsResource', '/user/ambari-qa/pigsmoke.out',
- immutable_paths = ['/apps/hive/warehouse', '/apps/falcon', '/mr-history/done', '/app-logs', '/tmp'],
+ immutable_paths = self.DEFAULT_IMMUTABLE_PATHS,
security_enabled = False,
hadoop_bin_dir = '/usr/bin',
keytab = UnknownConfigurationMock(),
@@ -48,7 +49,7 @@ class TestPigServiceCheck(RMFTestCase):
action = ['delete_on_execute'], hdfs_resource_ignore_file='/var/lib/ambari-agent/data/.hdfs_resource_ignore',
)
self.assertResourceCalled('HdfsResource', '/user/ambari-qa/passwd',
- immutable_paths = ['/apps/hive/warehouse', '/apps/falcon', '/mr-history/done', '/app-logs', '/tmp'],
+ immutable_paths = self.DEFAULT_IMMUTABLE_PATHS,
security_enabled = False,
hadoop_bin_dir = '/usr/bin',
keytab = UnknownConfigurationMock(),
@@ -64,7 +65,7 @@ class TestPigServiceCheck(RMFTestCase):
action = ['create_on_execute'], hdfs_resource_ignore_file='/var/lib/ambari-agent/data/.hdfs_resource_ignore',
)
self.assertResourceCalled('HdfsResource', None,
- immutable_paths = ['/apps/hive/warehouse', '/apps/falcon', '/mr-history/done', '/app-logs', '/tmp'],
+ immutable_paths = self.DEFAULT_IMMUTABLE_PATHS,
security_enabled = False,
hadoop_bin_dir = '/usr/bin',
keytab = UnknownConfigurationMock(),
@@ -107,7 +108,7 @@ class TestPigServiceCheck(RMFTestCase):
)
self.assertResourceCalled('HdfsResource', '/user/ambari-qa/pigsmoke.out',
- immutable_paths = ['/apps/hive/warehouse', '/apps/falcon', '/mr-history/done', '/app-logs', '/tmp'],
+ immutable_paths = self.DEFAULT_IMMUTABLE_PATHS,
security_enabled = True,
hadoop_bin_dir = '/usr/bin',
keytab = '/etc/security/keytabs/hdfs.headless.keytab',
@@ -122,7 +123,7 @@ class TestPigServiceCheck(RMFTestCase):
action = ['delete_on_execute'], hdfs_resource_ignore_file='/var/lib/ambari-agent/data/.hdfs_resource_ignore',
)
self.assertResourceCalled('HdfsResource', '/user/ambari-qa/passwd',
- immutable_paths = ['/apps/hive/warehouse', '/apps/falcon', '/mr-history/done', '/app-logs', '/tmp'],
+ immutable_paths = self.DEFAULT_IMMUTABLE_PATHS,
security_enabled = True,
hadoop_bin_dir = '/usr/bin',
keytab = '/etc/security/keytabs/hdfs.headless.keytab',
@@ -138,7 +139,7 @@ class TestPigServiceCheck(RMFTestCase):
action = ['create_on_execute'], hdfs_resource_ignore_file='/var/lib/ambari-agent/data/.hdfs_resource_ignore',
)
self.assertResourceCalled('HdfsResource', None,
- immutable_paths = ['/apps/hive/warehouse', '/apps/falcon', '/mr-history/done', '/app-logs', '/tmp'],
+ immutable_paths = self.DEFAULT_IMMUTABLE_PATHS,
security_enabled = True,
hadoop_bin_dir = '/usr/bin',
keytab = '/etc/security/keytabs/hdfs.headless.keytab',
http://git-wip-us.apache.org/repos/asf/ambari/blob/4277dbe8/ambari-server/src/test/python/stacks/2.0.6/YARN/test_historyserver.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.0.6/YARN/test_historyserver.py b/ambari-server/src/test/python/stacks/2.0.6/YARN/test_historyserver.py
index dc1e362..7cca7eb 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/YARN/test_historyserver.py
+++ b/ambari-server/src/test/python/stacks/2.0.6/YARN/test_historyserver.py
@@ -33,6 +33,7 @@ origin_exists = os.path.exists
class TestHistoryServer(RMFTestCase):
COMMON_SERVICES_PACKAGE_DIR = "YARN/2.1.0.2.0/package"
STACK_VERSION = "2.0.6"
+ DEFAULT_IMMUTABLE_PATHS = ['/apps/hive/warehouse', '/apps/falcon', '/mr-history/done', '/app-logs', '/tmp']
def test_configure_default(self):
self.executeScript(self.COMMON_SERVICES_PACKAGE_DIR + "/scripts/historyserver.py",
@@ -58,7 +59,7 @@ class TestHistoryServer(RMFTestCase):
pid_check_cmd = 'ls /var/run/hadoop-mapreduce/mapred/mapred-mapred-historyserver.pid >/dev/null 2>&1 && ps -p `cat /var/run/hadoop-mapreduce/mapred/mapred-mapred-historyserver.pid` >/dev/null 2>&1'
self.assertResourceCalled("HdfsResource", "/apps/tez/",
- immutable_paths = ['/apps/hive/warehouse', '/apps/falcon', '/mr-history/done', '/app-logs', '/tmp'],
+ immutable_paths = self.DEFAULT_IMMUTABLE_PATHS,
type="directory",
action=["create_on_execute"], hdfs_resource_ignore_file='/var/lib/ambari-agent/data/.hdfs_resource_ignore',
user=u"hdfs",
@@ -75,7 +76,7 @@ class TestHistoryServer(RMFTestCase):
)
self.assertResourceCalled("HdfsResource", "/apps/tez/lib/",
- immutable_paths = ['/apps/hive/warehouse', '/apps/falcon', '/mr-history/done', '/app-logs', '/tmp'],
+ immutable_paths = self.DEFAULT_IMMUTABLE_PATHS,
type="directory",
action=["create_on_execute"], hdfs_resource_ignore_file='/var/lib/ambari-agent/data/.hdfs_resource_ignore',
user=u'hdfs',
@@ -92,7 +93,7 @@ class TestHistoryServer(RMFTestCase):
)
self.assertResourceCalled("HdfsResource", None,
- immutable_paths = ['/apps/hive/warehouse', '/apps/falcon', '/mr-history/done', '/app-logs', '/tmp'],
+ immutable_paths = self.DEFAULT_IMMUTABLE_PATHS,
action=['execute'], hdfs_resource_ignore_file='/var/lib/ambari-agent/data/.hdfs_resource_ignore',
user=u'hdfs',
hadoop_bin_dir="/usr/bin",
@@ -194,7 +195,7 @@ class TestHistoryServer(RMFTestCase):
def assert_configure_default(self):
self.assertResourceCalled('HdfsResource', '/app-logs',
- immutable_paths = ['/apps/hive/warehouse', '/apps/falcon', '/mr-history/done', '/app-logs', '/tmp'],
+ immutable_paths = self.DEFAULT_IMMUTABLE_PATHS,
security_enabled = False,
hadoop_conf_dir = '/etc/hadoop/conf',
keytab = UnknownConfigurationMock(),
@@ -209,7 +210,7 @@ class TestHistoryServer(RMFTestCase):
mode = 0777,
)
self.assertResourceCalled('HdfsResource', '/tmp/entity-file-history/active',
- immutable_paths = ['/apps/hive/warehouse', '/apps/falcon', '/mr-history/done', '/app-logs', '/tmp'],
+ immutable_paths = self.DEFAULT_IMMUTABLE_PATHS,
security_enabled = False,
hadoop_bin_dir = '/usr/bin',
keytab = UnknownConfigurationMock(),
@@ -225,7 +226,7 @@ class TestHistoryServer(RMFTestCase):
action = ['create_on_execute'], hdfs_resource_ignore_file='/var/lib/ambari-agent/data/.hdfs_resource_ignore',
)
self.assertResourceCalled('HdfsResource', '/mapred',
- immutable_paths = ['/apps/hive/warehouse', '/apps/falcon', '/mr-history/done', '/app-logs', '/tmp'],
+ immutable_paths = self.DEFAULT_IMMUTABLE_PATHS,
security_enabled = False,
hadoop_bin_dir = '/usr/bin',
keytab = UnknownConfigurationMock(),
@@ -237,7 +238,7 @@ class TestHistoryServer(RMFTestCase):
action = ['create_on_execute'], hdfs_resource_ignore_file='/var/lib/ambari-agent/data/.hdfs_resource_ignore', hdfs_site=self.getConfig()['configurations']['hdfs-site'], principal_name=UnknownConfigurationMock(), default_fs='hdfs://c6401.ambari.apache.org:8020',
)
self.assertResourceCalled('HdfsResource', '/mapred/system',
- immutable_paths = ['/apps/hive/warehouse', '/apps/falcon', '/mr-history/done', '/app-logs', '/tmp'],
+ immutable_paths = self.DEFAULT_IMMUTABLE_PATHS,
security_enabled = False,
hadoop_bin_dir = '/usr/bin',
keytab = UnknownConfigurationMock(),
@@ -249,7 +250,7 @@ class TestHistoryServer(RMFTestCase):
action = ['create_on_execute'], hdfs_resource_ignore_file='/var/lib/ambari-agent/data/.hdfs_resource_ignore', hdfs_site=self.getConfig()['configurations']['hdfs-site'], principal_name=UnknownConfigurationMock(), default_fs='hdfs://c6401.ambari.apache.org:8020',
)
self.assertResourceCalled('HdfsResource', '/mr-history/done',
- immutable_paths = ['/apps/hive/warehouse', '/apps/falcon', '/mr-history/done', '/app-logs', '/tmp'],
+ immutable_paths = self.DEFAULT_IMMUTABLE_PATHS,
security_enabled = False,
hadoop_conf_dir = '/etc/hadoop/conf',
keytab = UnknownConfigurationMock(),
@@ -264,7 +265,7 @@ class TestHistoryServer(RMFTestCase):
mode = 0777,
)
self.assertResourceCalled('HdfsResource', None,
- immutable_paths = ['/apps/hive/warehouse', '/apps/falcon', '/mr-history/done', '/app-logs', '/tmp'],
+ immutable_paths = self.DEFAULT_IMMUTABLE_PATHS,
security_enabled = False,
hadoop_bin_dir = '/usr/bin',
keytab = UnknownConfigurationMock(),
@@ -442,7 +443,7 @@ class TestHistoryServer(RMFTestCase):
def assert_configure_secured(self):
self.assertResourceCalled('HdfsResource', '/app-logs',
- immutable_paths = ['/apps/hive/warehouse', '/apps/falcon', '/mr-history/done', '/app-logs', '/tmp'],
+ immutable_paths = self.DEFAULT_IMMUTABLE_PATHS,
security_enabled = True,
hadoop_conf_dir = '/etc/hadoop/conf',
keytab = '/etc/security/keytabs/hdfs.headless.keytab',
@@ -457,7 +458,7 @@ class TestHistoryServer(RMFTestCase):
mode = 0777,
)
self.assertResourceCalled('HdfsResource', '/tmp/entity-file-history/active',
- immutable_paths = ['/apps/hive/warehouse', '/apps/falcon', '/mr-history/done', '/app-logs', '/tmp'],
+ immutable_paths = self.DEFAULT_IMMUTABLE_PATHS,
security_enabled = True,
hadoop_bin_dir = '/usr/bin',
keytab = '/etc/security/keytabs/hdfs.headless.keytab',
@@ -473,7 +474,7 @@ class TestHistoryServer(RMFTestCase):
action = ['create_on_execute'], hdfs_resource_ignore_file='/var/lib/ambari-agent/data/.hdfs_resource_ignore',
)
self.assertResourceCalled('HdfsResource', '/mapred',
- immutable_paths = ['/apps/hive/warehouse', '/apps/falcon', '/mr-history/done', '/app-logs', '/tmp'],
+ immutable_paths = self.DEFAULT_IMMUTABLE_PATHS,
security_enabled = True,
hadoop_bin_dir = '/usr/bin',
keytab = '/etc/security/keytabs/hdfs.headless.keytab',
@@ -485,7 +486,7 @@ class TestHistoryServer(RMFTestCase):
action = ['create_on_execute'], hdfs_resource_ignore_file='/var/lib/ambari-agent/data/.hdfs_resource_ignore', hdfs_site=self.getConfig()['configurations']['hdfs-site'], principal_name='hdfs', default_fs='hdfs://c6401.ambari.apache.org:8020',
)
self.assertResourceCalled('HdfsResource', '/mapred/system',
- immutable_paths = ['/apps/hive/warehouse', '/apps/falcon', '/mr-history/done', '/app-logs', '/tmp'],
+ immutable_paths = self.DEFAULT_IMMUTABLE_PATHS,
security_enabled = True,
hadoop_bin_dir = '/usr/bin',
keytab = '/etc/security/keytabs/hdfs.headless.keytab',
@@ -497,7 +498,7 @@ class TestHistoryServer(RMFTestCase):
action = ['create_on_execute'], hdfs_resource_ignore_file='/var/lib/ambari-agent/data/.hdfs_resource_ignore', hdfs_site=self.getConfig()['configurations']['hdfs-site'], principal_name='hdfs', default_fs='hdfs://c6401.ambari.apache.org:8020',
)
self.assertResourceCalled('HdfsResource', '/mr-history/done',
- immutable_paths = ['/apps/hive/warehouse', '/apps/falcon', '/mr-history/done', '/app-logs', '/tmp'],
+ immutable_paths = self.DEFAULT_IMMUTABLE_PATHS,
security_enabled = True,
hadoop_conf_dir = '/etc/hadoop/conf',
keytab = '/etc/security/keytabs/hdfs.headless.keytab',
@@ -512,7 +513,7 @@ class TestHistoryServer(RMFTestCase):
mode = 0777,
)
self.assertResourceCalled('HdfsResource', None,
- immutable_paths = ['/apps/hive/warehouse', '/apps/falcon', '/mr-history/done', '/app-logs', '/tmp'],
+ immutable_paths = self.DEFAULT_IMMUTABLE_PATHS,
security_enabled = True,
hadoop_bin_dir = '/usr/bin',
keytab = '/etc/security/keytabs/hdfs.headless.keytab',
@@ -841,7 +842,7 @@ class TestHistoryServer(RMFTestCase):
self.assertResourceCalled("Link", "/etc/hadoop/conf", to="/usr/hdp/current/hadoop-client/conf")
self.assertResourceCalled('HdfsResource', None,
- immutable_paths = ['/apps/hive/warehouse', '/apps/falcon', '/mr-history/done', '/app-logs', '/tmp'],
+ immutable_paths = self.DEFAULT_IMMUTABLE_PATHS,
security_enabled = False,
hadoop_bin_dir = '/usr/hdp/current/hadoop-client/bin',
keytab = UnknownConfigurationMock(),
http://git-wip-us.apache.org/repos/asf/ambari/blob/4277dbe8/ambari-server/src/test/python/stacks/2.0.6/YARN/test_mapreduce2_service_check.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.0.6/YARN/test_mapreduce2_service_check.py b/ambari-server/src/test/python/stacks/2.0.6/YARN/test_mapreduce2_service_check.py
index 73274da..fddab87 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/YARN/test_mapreduce2_service_check.py
+++ b/ambari-server/src/test/python/stacks/2.0.6/YARN/test_mapreduce2_service_check.py
@@ -29,6 +29,7 @@ origin_exists = os.path.exists
class TestServiceCheck(RMFTestCase):
COMMON_SERVICES_PACKAGE_DIR = "YARN/2.1.0.2.0/package"
STACK_VERSION = "2.0.6"
+ DEFAULT_IMMUTABLE_PATHS = ['/apps/hive/warehouse', '/apps/falcon', '/mr-history/done', '/app-logs', '/tmp']
def test_service_check_default(self):
@@ -40,7 +41,7 @@ class TestServiceCheck(RMFTestCase):
target = RMFTestCase.TARGET_COMMON_SERVICES
)
self.assertResourceCalled('HdfsResource', '/user/ambari-qa/mapredsmokeoutput',
- immutable_paths = ['/apps/hive/warehouse', '/apps/falcon', '/mr-history/done', '/app-logs', '/tmp'],
+ immutable_paths = self.DEFAULT_IMMUTABLE_PATHS,
security_enabled = False,
hadoop_bin_dir = '/usr/bin',
keytab = UnknownConfigurationMock(),
@@ -51,7 +52,7 @@ class TestServiceCheck(RMFTestCase):
type = 'directory',
)
self.assertResourceCalled('HdfsResource', '/user/ambari-qa/mapredsmokeinput',
- immutable_paths = ['/apps/hive/warehouse', '/apps/falcon', '/mr-history/done', '/app-logs', '/tmp'],
+ immutable_paths = self.DEFAULT_IMMUTABLE_PATHS,
security_enabled = False,
hadoop_bin_dir = '/usr/bin',
keytab = UnknownConfigurationMock(),
@@ -63,7 +64,7 @@ class TestServiceCheck(RMFTestCase):
type = 'file',
)
self.assertResourceCalled('HdfsResource', None,
- immutable_paths = ['/apps/hive/warehouse', '/apps/falcon', '/mr-history/done', '/app-logs', '/tmp'],
+ immutable_paths = self.DEFAULT_IMMUTABLE_PATHS,
security_enabled = False,
hadoop_bin_dir = '/usr/bin',
keytab = UnknownConfigurationMock(),
@@ -97,7 +98,7 @@ class TestServiceCheck(RMFTestCase):
target = RMFTestCase.TARGET_COMMON_SERVICES
)
self.assertResourceCalled('HdfsResource', '/user/ambari-qa/mapredsmokeoutput',
- immutable_paths = ['/apps/hive/warehouse', '/apps/falcon', '/mr-history/done', '/app-logs', '/tmp'],
+ immutable_paths = self.DEFAULT_IMMUTABLE_PATHS,
security_enabled = True,
hadoop_bin_dir = '/usr/bin',
keytab = '/etc/security/keytabs/hdfs.headless.keytab',
@@ -108,7 +109,7 @@ class TestServiceCheck(RMFTestCase):
type = 'directory',
)
self.assertResourceCalled('HdfsResource', '/user/ambari-qa/mapredsmokeinput',
- immutable_paths = ['/apps/hive/warehouse', '/apps/falcon', '/mr-history/done', '/app-logs', '/tmp'],
+ immutable_paths = self.DEFAULT_IMMUTABLE_PATHS,
security_enabled = True,
hadoop_bin_dir = '/usr/bin',
keytab = '/etc/security/keytabs/hdfs.headless.keytab',
@@ -120,7 +121,7 @@ class TestServiceCheck(RMFTestCase):
type = 'file',
)
self.assertResourceCalled('HdfsResource', None,
- immutable_paths = ['/apps/hive/warehouse', '/apps/falcon', '/mr-history/done', '/app-logs', '/tmp'],
+ immutable_paths = self.DEFAULT_IMMUTABLE_PATHS,
security_enabled = True,
hadoop_bin_dir = '/usr/bin',
keytab = '/etc/security/keytabs/hdfs.headless.keytab',
http://git-wip-us.apache.org/repos/asf/ambari/blob/4277dbe8/ambari-server/src/test/python/stacks/2.1/FALCON/test_falcon_server.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.1/FALCON/test_falcon_server.py b/ambari-server/src/test/python/stacks/2.1/FALCON/test_falcon_server.py
index 40a3abb..922f28f 100644
--- a/ambari-server/src/test/python/stacks/2.1/FALCON/test_falcon_server.py
+++ b/ambari-server/src/test/python/stacks/2.1/FALCON/test_falcon_server.py
@@ -31,6 +31,7 @@ class TestFalconServer(RMFTestCase):
COMMON_SERVICES_PACKAGE_DIR = "FALCON/0.5.0.2.1/package"
STACK_VERSION = "2.1"
UPGRADE_STACK_VERSION = "2.2"
+ DEFAULT_IMMUTABLE_PATHS = ['/apps/hive/warehouse', '/apps/falcon', '/mr-history/done', '/app-logs', '/tmp']
def test_start_default(self):
self.executeScript(self.COMMON_SERVICES_PACKAGE_DIR + "/scripts/falcon_server.py",
@@ -132,7 +133,7 @@ class TestFalconServer(RMFTestCase):
recursive = True
)
self.assertResourceCalled('HdfsResource', '/apps/falcon',
- immutable_paths = ['/apps/hive/warehouse', '/apps/falcon', '/mr-history/done', '/app-logs', '/tmp'],
+ immutable_paths = self.DEFAULT_IMMUTABLE_PATHS,
security_enabled = False,
hadoop_bin_dir = '/usr/bin',
keytab = UnknownConfigurationMock(),
@@ -149,7 +150,7 @@ class TestFalconServer(RMFTestCase):
recursive = True,
)
self.assertResourceCalled('HdfsResource', '/apps/data-mirroring',
- immutable_paths = ['/apps/hive/warehouse', '/apps/falcon', '/mr-history/done', '/app-logs', '/tmp'],
+ immutable_paths = self.DEFAULT_IMMUTABLE_PATHS,
security_enabled = False,
hadoop_bin_dir = '/usr/bin',
keytab = UnknownConfigurationMock(),
@@ -167,7 +168,7 @@ class TestFalconServer(RMFTestCase):
)
self.assertResourceCalled('HdfsResource', None,
- immutable_paths = ['/apps/hive/warehouse', '/apps/falcon', '/mr-history/done', '/app-logs', '/tmp'],
+ immutable_paths = self.DEFAULT_IMMUTABLE_PATHS,
security_enabled = False,
hadoop_bin_dir = '/usr/bin',
keytab = UnknownConfigurationMock(),
@@ -315,7 +316,7 @@ class TestFalconServer(RMFTestCase):
recursive = True,
)
self.assertResourceCalled('HdfsResource', '/apps/falcon',
- immutable_paths = ['/apps/hive/warehouse', '/apps/falcon', '/mr-history/done', '/app-logs', '/tmp'],
+ immutable_paths = self.DEFAULT_IMMUTABLE_PATHS,
security_enabled = False,
hadoop_bin_dir = '/usr/hdp/current/hadoop-client/bin',
keytab = UnknownConfigurationMock(),
@@ -335,7 +336,7 @@ class TestFalconServer(RMFTestCase):
recursive = True,
)
self.assertResourceCalled('HdfsResource', '/apps/data-mirroring',
- immutable_paths = ['/apps/hive/warehouse', '/apps/falcon', '/mr-history/done', '/app-logs', '/tmp'],
+ immutable_paths = self.DEFAULT_IMMUTABLE_PATHS,
security_enabled = False,
hadoop_bin_dir = '/usr/hdp/current/hadoop-client/bin',
keytab = UnknownConfigurationMock(),
@@ -355,7 +356,7 @@ class TestFalconServer(RMFTestCase):
mode = 0770,
)
self.assertResourceCalled('HdfsResource', None,
- immutable_paths = ['/apps/hive/warehouse', '/apps/falcon', '/mr-history/done', '/app-logs', '/tmp'],
+ immutable_paths = self.DEFAULT_IMMUTABLE_PATHS,
security_enabled = False,
hadoop_bin_dir = '/usr/hdp/current/hadoop-client/bin',
keytab = UnknownConfigurationMock(),
http://git-wip-us.apache.org/repos/asf/ambari/blob/4277dbe8/ambari-server/src/test/python/stacks/2.1/TEZ/test_service_check.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.1/TEZ/test_service_check.py b/ambari-server/src/test/python/stacks/2.1/TEZ/test_service_check.py
index cb9f3e0..70f99a9 100644
--- a/ambari-server/src/test/python/stacks/2.1/TEZ/test_service_check.py
+++ b/ambari-server/src/test/python/stacks/2.1/TEZ/test_service_check.py
@@ -24,6 +24,7 @@ from stacks.utils.RMFTestCase import *
class TestTezServiceCheck(RMFTestCase):
COMMON_SERVICES_PACKAGE_DIR = "TEZ/0.4.0.2.1/package"
STACK_VERSION = "2.1"
+ DEFAULT_IMMUTABLE_PATHS = ['/apps/hive/warehouse', '/apps/falcon', '/mr-history/done', '/app-logs', '/tmp']
def test_service_check(self):
self.executeScript(self.COMMON_SERVICES_PACKAGE_DIR + "/scripts/service_check.py",
@@ -39,7 +40,7 @@ class TestTezServiceCheck(RMFTestCase):
)
self.assertResourceCalled('HdfsResource', '/tmp/tezsmokeoutput',
- immutable_paths = ['/apps/hive/warehouse', '/apps/falcon', '/mr-history/done', '/app-logs', '/tmp'],
+ immutable_paths = self.DEFAULT_IMMUTABLE_PATHS,
security_enabled = False,
hadoop_bin_dir = '/usr/bin',
keytab = UnknownConfigurationMock(),
@@ -51,7 +52,7 @@ class TestTezServiceCheck(RMFTestCase):
)
self.assertResourceCalled('HdfsResource', '/tmp/tezsmokeinput',
- immutable_paths = ['/apps/hive/warehouse', '/apps/falcon', '/mr-history/done', '/app-logs', '/tmp'],
+ immutable_paths = self.DEFAULT_IMMUTABLE_PATHS,
security_enabled = False,
hadoop_bin_dir = '/usr/bin',
keytab = UnknownConfigurationMock(),
@@ -63,7 +64,7 @@ class TestTezServiceCheck(RMFTestCase):
action = ['create_on_execute'], hdfs_resource_ignore_file='/var/lib/ambari-agent/data/.hdfs_resource_ignore', hdfs_site=self.getConfig()['configurations']['hdfs-site'], principal_name=UnknownConfigurationMock(), default_fs='hdfs://c6401.ambari.apache.org:8020',
)
self.assertResourceCalled('HdfsResource', '/tmp/tezsmokeinput/sample-tez-test',
- immutable_paths = ['/apps/hive/warehouse', '/apps/falcon', '/mr-history/done', '/app-logs', '/tmp'],
+ immutable_paths = self.DEFAULT_IMMUTABLE_PATHS,
security_enabled = False,
hadoop_bin_dir = '/usr/bin',
keytab = UnknownConfigurationMock(),
@@ -76,7 +77,7 @@ class TestTezServiceCheck(RMFTestCase):
action = ['create_on_execute'], hdfs_resource_ignore_file='/var/lib/ambari-agent/data/.hdfs_resource_ignore', hdfs_site=self.getConfig()['configurations']['hdfs-site'], principal_name=UnknownConfigurationMock(), default_fs='hdfs://c6401.ambari.apache.org:8020',
)
self.assertResourceCalled('HdfsResource', None,
- immutable_paths = ['/apps/hive/warehouse', '/apps/falcon', '/mr-history/done', '/app-logs', '/tmp'],
+ immutable_paths = self.DEFAULT_IMMUTABLE_PATHS,
security_enabled = False,
hadoop_bin_dir = '/usr/bin',
keytab = UnknownConfigurationMock(),
@@ -116,7 +117,7 @@ class TestTezServiceCheck(RMFTestCase):
mode = 0755,
)
self.assertResourceCalled('HdfsResource', '/tmp/tezsmokeoutput',
- immutable_paths = ['/apps/hive/warehouse', '/apps/falcon', '/mr-history/done', '/app-logs', '/tmp'],
+ immutable_paths = self.DEFAULT_IMMUTABLE_PATHS,
security_enabled = True,
hadoop_bin_dir = '/usr/bin',
keytab = '/etc/security/keytabs/hdfs.headless.keytab',
@@ -130,7 +131,7 @@ class TestTezServiceCheck(RMFTestCase):
type = 'directory',
)
self.assertResourceCalled('HdfsResource', '/tmp/tezsmokeinput',
- immutable_paths = ['/apps/hive/warehouse', '/apps/falcon', '/mr-history/done', '/app-logs', '/tmp'],
+ immutable_paths = self.DEFAULT_IMMUTABLE_PATHS,
security_enabled = True,
hadoop_bin_dir = '/usr/bin',
keytab = '/etc/security/keytabs/hdfs.headless.keytab',
@@ -145,7 +146,7 @@ class TestTezServiceCheck(RMFTestCase):
action = ['create_on_execute'], hdfs_resource_ignore_file='/var/lib/ambari-agent/data/.hdfs_resource_ignore',
)
self.assertResourceCalled('HdfsResource', '/tmp/tezsmokeinput/sample-tez-test',
- immutable_paths = ['/apps/hive/warehouse', '/apps/falcon', '/mr-history/done', '/app-logs', '/tmp'],
+ immutable_paths = self.DEFAULT_IMMUTABLE_PATHS,
security_enabled = True,
hadoop_bin_dir = '/usr/bin',
keytab = '/etc/security/keytabs/hdfs.headless.keytab',
@@ -161,7 +162,7 @@ class TestTezServiceCheck(RMFTestCase):
action = ['create_on_execute'], hdfs_resource_ignore_file='/var/lib/ambari-agent/data/.hdfs_resource_ignore',
)
self.assertResourceCalled('HdfsResource', None,
- immutable_paths = ['/apps/hive/warehouse', '/apps/falcon', '/mr-history/done', '/app-logs', '/tmp'],
+ immutable_paths = self.DEFAULT_IMMUTABLE_PATHS,
security_enabled = True,
hadoop_bin_dir = '/usr/bin',
keytab = '/etc/security/keytabs/hdfs.headless.keytab',
http://git-wip-us.apache.org/repos/asf/ambari/blob/4277dbe8/ambari-server/src/test/python/stacks/2.1/YARN/test_apptimelineserver.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.1/YARN/test_apptimelineserver.py b/ambari-server/src/test/python/stacks/2.1/YARN/test_apptimelineserver.py
index 0c24fa0..b43a429 100644
--- a/ambari-server/src/test/python/stacks/2.1/YARN/test_apptimelineserver.py
+++ b/ambari-server/src/test/python/stacks/2.1/YARN/test_apptimelineserver.py
@@ -32,6 +32,7 @@ origin_exists = os.path.exists
class TestAppTimelineServer(RMFTestCase):
COMMON_SERVICES_PACKAGE_DIR = "YARN/2.1.0.2.0/package"
STACK_VERSION = "2.0.6"
+ DEFAULT_IMMUTABLE_PATHS = ['/apps/hive/warehouse', '/apps/falcon', '/mr-history/done', '/app-logs', '/tmp']
def test_configure_default(self):
self.executeScript(self.COMMON_SERVICES_PACKAGE_DIR + "/scripts/application_timeline_server.py",
@@ -188,7 +189,7 @@ class TestAppTimelineServer(RMFTestCase):
cd_access='a'
)
self.assertResourceCalled('HdfsResource', None,
- immutable_paths = ['/apps/hive/warehouse', '/apps/falcon', '/mr-history/done', '/app-logs', '/tmp'],
+ immutable_paths = self.DEFAULT_IMMUTABLE_PATHS,
security_enabled = False,
hadoop_bin_dir = '/usr/bin',
keytab = UnknownConfigurationMock(),
http://git-wip-us.apache.org/repos/asf/ambari/blob/4277dbe8/ambari-server/src/test/python/stacks/2.2/PIG/test_pig_service_check.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.2/PIG/test_pig_service_check.py b/ambari-server/src/test/python/stacks/2.2/PIG/test_pig_service_check.py
index 713dbe4..06edfd3 100644
--- a/ambari-server/src/test/python/stacks/2.2/PIG/test_pig_service_check.py
+++ b/ambari-server/src/test/python/stacks/2.2/PIG/test_pig_service_check.py
@@ -24,6 +24,7 @@ from stacks.utils.RMFTestCase import *
class TestPigServiceCheck(RMFTestCase):
COMMON_SERVICES_PACKAGE_DIR = "PIG/0.12.0.2.0/package"
STACK_VERSION = "2.2"
+ DEFAULT_IMMUTABLE_PATHS = ['/apps/hive/warehouse', '/apps/falcon', '/mr-history/done', '/app-logs', '/tmp']
@patch("resource_management.libraries.functions.copy_tarball.copy_to_hdfs")
def test_service_check_secure(self, copy_to_hdfs_mock):
@@ -38,7 +39,7 @@ class TestPigServiceCheck(RMFTestCase):
)
self.assertResourceCalled('HdfsResource', '/user/ambari-qa/pigsmoke.out',
- immutable_paths = ['/apps/hive/warehouse', '/apps/falcon', '/mr-history/done', '/app-logs', '/tmp'],
+ immutable_paths = self.DEFAULT_IMMUTABLE_PATHS,
security_enabled = True,
hadoop_bin_dir = '/usr/hdp/current/hadoop-client/bin',
keytab = '/etc/security/keytabs/hdfs.headless.keytab',
@@ -53,7 +54,7 @@ class TestPigServiceCheck(RMFTestCase):
action = ['delete_on_execute'], hdfs_resource_ignore_file='/var/lib/ambari-agent/data/.hdfs_resource_ignore',
)
self.assertResourceCalled('HdfsResource', '/user/ambari-qa/passwd',
- immutable_paths = ['/apps/hive/warehouse', '/apps/falcon', '/mr-history/done', '/app-logs', '/tmp'],
+ immutable_paths = self.DEFAULT_IMMUTABLE_PATHS,
security_enabled = True,
hadoop_bin_dir = '/usr/hdp/current/hadoop-client/bin',
keytab = '/etc/security/keytabs/hdfs.headless.keytab',
@@ -69,7 +70,7 @@ class TestPigServiceCheck(RMFTestCase):
action = ['create_on_execute'], hdfs_resource_ignore_file='/var/lib/ambari-agent/data/.hdfs_resource_ignore',
)
self.assertResourceCalled('HdfsResource', None,
- immutable_paths = ['/apps/hive/warehouse', '/apps/falcon', '/mr-history/done', '/app-logs', '/tmp'],
+ immutable_paths = self.DEFAULT_IMMUTABLE_PATHS,
security_enabled = True,
hadoop_bin_dir = '/usr/hdp/current/hadoop-client/bin',
keytab = '/etc/security/keytabs/hdfs.headless.keytab',
@@ -101,7 +102,7 @@ class TestPigServiceCheck(RMFTestCase):
conf_dir = '/usr/hdp/current/hadoop-client/conf',
)
self.assertResourceCalled('HdfsResource', '/user/ambari-qa/pigsmoke.out',
- immutable_paths = ['/apps/hive/warehouse', '/apps/falcon', '/mr-history/done', '/app-logs', '/tmp'],
+ immutable_paths = self.DEFAULT_IMMUTABLE_PATHS,
security_enabled = True,
hadoop_bin_dir = '/usr/hdp/current/hadoop-client/bin',
keytab = '/etc/security/keytabs/hdfs.headless.keytab',
@@ -116,7 +117,7 @@ class TestPigServiceCheck(RMFTestCase):
action = ['delete_on_execute'], hdfs_resource_ignore_file='/var/lib/ambari-agent/data/.hdfs_resource_ignore',
)
self.assertResourceCalled('HdfsResource', '/user/ambari-qa/passwd',
- immutable_paths = ['/apps/hive/warehouse', '/apps/falcon', '/mr-history/done', '/app-logs', '/tmp'],
+ immutable_paths = self.DEFAULT_IMMUTABLE_PATHS,
security_enabled = True,
hadoop_bin_dir = '/usr/hdp/current/hadoop-client/bin',
keytab = '/etc/security/keytabs/hdfs.headless.keytab',
@@ -134,7 +135,7 @@ class TestPigServiceCheck(RMFTestCase):
copy_to_hdfs_mock.assert_called_with("tez", "hadoop", "hdfs", host_sys_prepped=False)
self.assertResourceCalled('HdfsResource', None,
- immutable_paths = ['/apps/hive/warehouse', '/apps/falcon', '/mr-history/done', '/app-logs', '/tmp'],
+ immutable_paths = self.DEFAULT_IMMUTABLE_PATHS,
security_enabled = True,
hadoop_bin_dir = '/usr/hdp/current/hadoop-client/bin',
keytab = '/etc/security/keytabs/hdfs.headless.keytab',
http://git-wip-us.apache.org/repos/asf/ambari/blob/4277dbe8/ambari-server/src/test/python/stacks/2.2/SPARK/test_job_history_server.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.2/SPARK/test_job_history_server.py b/ambari-server/src/test/python/stacks/2.2/SPARK/test_job_history_server.py
index 5603678..75559f4 100644
--- a/ambari-server/src/test/python/stacks/2.2/SPARK/test_job_history_server.py
+++ b/ambari-server/src/test/python/stacks/2.2/SPARK/test_job_history_server.py
@@ -25,6 +25,7 @@ from stacks.utils.RMFTestCase import *
class TestJobHistoryServer(RMFTestCase):
COMMON_SERVICES_PACKAGE_DIR = "SPARK/1.2.0.2.2/package"
STACK_VERSION = "2.2"
+ DEFAULT_IMMUTABLE_PATHS = ['/apps/hive/warehouse', '/apps/falcon', '/mr-history/done', '/app-logs', '/tmp']
@patch("resource_management.libraries.functions.copy_tarball.copy_to_hdfs")
def test_configure_default(self, copy_to_hdfs_mock):
@@ -51,7 +52,7 @@ class TestJobHistoryServer(RMFTestCase):
)
self.assert_configure_default()
self.assertResourceCalled('HdfsResource', None,
- immutable_paths = ['/apps/hive/warehouse', '/apps/falcon', '/mr-history/done', '/app-logs', '/tmp'],
+ immutable_paths = self.DEFAULT_IMMUTABLE_PATHS,
security_enabled = False,
hadoop_bin_dir = '/usr/hdp/current/hadoop-client/bin',
keytab = UnknownConfigurationMock(),
@@ -114,7 +115,7 @@ class TestJobHistoryServer(RMFTestCase):
)
self.assertResourceCalled('HdfsResource', None,
- immutable_paths = ['/apps/hive/warehouse', '/apps/falcon', '/mr-history/done', '/app-logs', '/tmp'],
+ immutable_paths = self.DEFAULT_IMMUTABLE_PATHS,
action=['execute'], hdfs_resource_ignore_file='/var/lib/ambari-agent/data/.hdfs_resource_ignore',
default_fs= UnknownConfigurationMock(),
hadoop_bin_dir='/usr/hdp/current/hadoop-client/bin',
@@ -165,7 +166,7 @@ class TestJobHistoryServer(RMFTestCase):
mode = 0775
)
self.assertResourceCalled('HdfsResource', '/user/spark',
- immutable_paths = ['/apps/hive/warehouse', '/apps/falcon', '/mr-history/done', '/app-logs', '/tmp'],
+ immutable_paths = self.DEFAULT_IMMUTABLE_PATHS,
security_enabled = False,
hadoop_bin_dir = '/usr/hdp/current/hadoop-client/bin',
keytab = UnknownConfigurationMock(),
@@ -181,7 +182,7 @@ class TestJobHistoryServer(RMFTestCase):
mode = 0775,
)
self.assertResourceCalled('HdfsResource', None,
- immutable_paths = ['/apps/hive/warehouse', '/apps/falcon', '/mr-history/done', '/app-logs', '/tmp'],
+ immutable_paths = self.DEFAULT_IMMUTABLE_PATHS,
security_enabled = False,
hadoop_bin_dir = '/usr/hdp/current/hadoop-client/bin',
keytab = UnknownConfigurationMock(),
@@ -236,7 +237,7 @@ class TestJobHistoryServer(RMFTestCase):
mode = 0775
)
self.assertResourceCalled('HdfsResource', '/user/spark',
- immutable_paths = ['/apps/hive/warehouse', '/apps/falcon', '/mr-history/done', '/app-logs', '/tmp'],
+ immutable_paths = self.DEFAULT_IMMUTABLE_PATHS,
security_enabled = True,
hadoop_bin_dir = '/usr/hdp/current/hadoop-client/bin',
keytab = UnknownConfigurationMock(),
@@ -252,7 +253,7 @@ class TestJobHistoryServer(RMFTestCase):
mode = 0775,
)
self.assertResourceCalled('HdfsResource', None,
- immutable_paths = ['/apps/hive/warehouse', '/apps/falcon', '/mr-history/done', '/app-logs', '/tmp'],
+ immutable_paths = self.DEFAULT_IMMUTABLE_PATHS,
security_enabled = True,
hadoop_bin_dir = '/usr/hdp/current/hadoop-client/bin',
keytab = UnknownConfigurationMock(),