ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From adorosz...@apache.org
Subject ambari git commit: AMBARI-21191. Custom log4j.properties of Flume - addendum: fix for Python unit test failure (wangjianfei via adoroszlai)
Date Wed, 21 Jun 2017 08:01:29 GMT
Repository: ambari
Updated Branches:
  refs/heads/trunk 7a050b052 -> 134406a65


AMBARI-21191. Custom log4j.properties of Flume - addendum: fix for Python unit test failure
(wangjianfei via adoroszlai)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/134406a6
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/134406a6
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/134406a6

Branch: refs/heads/trunk
Commit: 134406a652e249001ef353d5a55b24d5dd53e811
Parents: 7a050b0
Author: wangjianfei <wangjianfei@cmss.chinamobile.com>
Authored: Wed Jun 21 10:01:06 2017 +0200
Committer: Attila Doroszlai <adoroszlai@hortonworks.com>
Committed: Wed Jun 21 10:01:06 2017 +0200

----------------------------------------------------------------------
 .../src/test/python/stacks/2.0.6/FLUME/test_flume.py      | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/134406a6/ambari-server/src/test/python/stacks/2.0.6/FLUME/test_flume.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.0.6/FLUME/test_flume.py b/ambari-server/src/test/python/stacks/2.0.6/FLUME/test_flume.py
index 02810e2..b867561 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/FLUME/test_flume.py
+++ b/ambari-server/src/test/python/stacks/2.0.6/FLUME/test_flume.py
@@ -257,7 +257,7 @@ class TestFlumeHandler(RMFTestCase):
 
     self.assertResourceCalled('File',
       '/etc/flume/conf/a1/log4j.properties',
-      content = Template('log4j.properties.j2', agent_name = 'a1'),
+      content = InlineTemplate(self.getConfig()['configurations']['flume-log4j']['content'],agent_name='a1'),
       owner='flume',
       mode = 0644)
 
@@ -311,7 +311,7 @@ class TestFlumeHandler(RMFTestCase):
     self.assertResourceCalled('File',
       '/etc/flume/conf/a1/log4j.properties',
       owner='flume',
-      content = Template('log4j.properties.j2', agent_name = 'a1'),
+      content = InlineTemplate(self.getConfig()['configurations']['flume-log4j']['content'],agent_name='a1'),
       mode = 0644)
     self.assertResourceCalled('File',
       '/etc/flume/conf/a1/ambari-meta.json',
@@ -335,7 +335,7 @@ class TestFlumeHandler(RMFTestCase):
     self.assertResourceCalled('File',
       '/etc/flume/conf/b1/log4j.properties',
       owner='flume',
-      content = Template('log4j.properties.j2', agent_name = 'b1'),
+      content = InlineTemplate(self.getConfig()['configurations']['flume-log4j']['content'],agent_name='b1'),
       mode = 0644)
     self.assertResourceCalled('File',
       '/etc/flume/conf/b1/ambari-meta.json',
@@ -482,7 +482,7 @@ class TestFlumeHandler(RMFTestCase):
     self.assertResourceCalled('File',
       '/etc/flume/conf/a1/log4j.properties',
       owner='flume',
-      content = Template('log4j.properties.j2', agent_name = 'a1'),
+      content = InlineTemplate(self.getConfig()['configurations']['flume-log4j']['content'],agent_name='a1'),
       mode = 0644)
 
     self.assertResourceCalled('File',
@@ -536,7 +536,7 @@ class TestFlumeHandler(RMFTestCase):
 
     self.assertResourceCalled('File',
       '/usr/hdp/current/flume-server/conf/a1/log4j.properties',
-      content = Template('log4j.properties.j2', agent_name = 'a1'),
+      content = InlineTemplate(self.getConfig()['configurations']['flume-log4j']['content'],agent_name='a1'),
       owner='flume',
       mode = 0644)
 


Mime
View raw message