AMBARI-18095. Update zookeeper server/client tests (oleewere)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/61a3da6a Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/61a3da6a Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/61a3da6a Branch: refs/heads/branch-dev-patch-upgrade Commit: 61a3da6a4ee3e68ee95bbd20e2cb401da0780b9a Parents: cbfa083 Author: oleewere <oleew...@gmail.com> Authored: Thu Sep 8 01:15:01 2016 +0200 Committer: oleewere <oleew...@gmail.com> Committed: Sat Nov 5 16:08:53 2016 +0100 ---------------------------------------------------------------------- .../python/stacks/2.0.6/ZOOKEEPER/test_zookeeper_client.py | 4 ++-- .../python/stacks/2.0.6/ZOOKEEPER/test_zookeeper_server.py | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/61a3da6a/ambari-server/src/test/python/stacks/2.0.6/ZOOKEEPER/test_zookeeper_client.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.0.6/ZOOKEEPER/test_zookeeper_client.py b/ambari-server/src/test/python/stacks/2.0.6/ZOOKEEPER/test_zookeeper_client.py index 8e028a1..e4c6fbd 100644 --- a/ambari-server/src/test/python/stacks/2.0.6/ZOOKEEPER/test_zookeeper_client.py +++ b/ambari-server/src/test/python/stacks/2.0.6/ZOOKEEPER/test_zookeeper_client.py @@ -79,7 +79,7 @@ class TestZookeeperClient(RMFTestCase): ) self.assertResourceCalled('File', '/etc/zookeeper/conf/log4j.properties', - content='log4jproperties\nline2', + content=InlineTemplate(self.getConfig()['configurations']['zookeeper-log4j']['content']), mode=0644, group='hadoop', owner='zookeeper' @@ -142,7 +142,7 @@ class TestZookeeperClient(RMFTestCase): ) self.assertResourceCalled('File', '/etc/zookeeper/conf/log4j.properties', - content='log4jproperties\nline2', + content=InlineTemplate(self.getConfig()['configurations']['zookeeper-log4j']['content']), mode=0644, group='hadoop', owner='zookeeper' http://git-wip-us.apache.org/repos/asf/ambari/blob/61a3da6a/ambari-server/src/test/python/stacks/2.0.6/ZOOKEEPER/test_zookeeper_server.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.0.6/ZOOKEEPER/test_zookeeper_server.py b/ambari-server/src/test/python/stacks/2.0.6/ZOOKEEPER/test_zookeeper_server.py index 7757fd9..b9ebea2 100644 --- a/ambari-server/src/test/python/stacks/2.0.6/ZOOKEEPER/test_zookeeper_server.py +++ b/ambari-server/src/test/python/stacks/2.0.6/ZOOKEEPER/test_zookeeper_server.py @@ -167,7 +167,7 @@ class TestZookeeperServer(RMFTestCase): ) self.assertResourceCalled('File', '/etc/zookeeper/conf/log4j.properties', - content='log4jproperties\nline2', + content=InlineTemplate(self.getConfig()['configurations']['zookeeper-log4j']['content']), mode=0644, group='hadoop', owner='zookeeper' @@ -225,10 +225,10 @@ class TestZookeeperServer(RMFTestCase): ) self.assertResourceCalled('File', '/etc/zookeeper/conf/log4j.properties', - content='log4jproperties\nline2', mode=0644, - group='hadoop', - owner='zookeeper' + owner='zookeeper', + content=InlineTemplate(self.getConfig()['configurations']['zookeeper-log4j']['content']), + group='hadoop' ) self.assertResourceCalled('File', '/etc/zookeeper/conf/zookeeper_jaas.conf', owner = 'zookeeper',
