Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id CAE1E200BDE for ; Mon, 7 Nov 2016 14:05:22 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id C9C44160B22; Mon, 7 Nov 2016 13:05:22 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id BE64E160B11 for ; Mon, 7 Nov 2016 14:05:21 +0100 (CET) Received: (qmail 99401 invoked by uid 500); 7 Nov 2016 13:05:19 -0000 Mailing-List: contact commits-help@ambari.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: ambari-dev@ambari.apache.org Delivered-To: mailing list commits@ambari.apache.org Received: (qmail 98961 invoked by uid 99); 7 Nov 2016 13:05:19 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 07 Nov 2016 13:05:19 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 6A67BEEE7B; Mon, 7 Nov 2016 13:05:19 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: jonathanhurley@apache.org To: commits@ambari.apache.org Date: Mon, 07 Nov 2016 13:05:41 -0000 Message-Id: In-Reply-To: <461452b9403a44a7aad35c447defd190@git.apache.org> References: <461452b9403a44a7aad35c447defd190@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [24/60] [abbrv] ambari git commit: AMBARI-18095. Update zookeeper server/client tests (oleewere) archived-at: Mon, 07 Nov 2016 13:05:23 -0000 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-feature-AMBARI-18634 Commit: 61a3da6a4ee3e68ee95bbd20e2cb401da0780b9a Parents: cbfa083 Author: oleewere Authored: Thu Sep 8 01:15:01 2016 +0200 Committer: oleewere 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',