Repository: ambari Updated Branches: refs/heads/trunk 45b423b7b -> 569f5661d
AMBARI-20088 ADDENDUM Log Search should handle turned off Credential Store too (mgergely) Change-Id: I277228c32a512eb36da0d7fba93ce5c2c0a55455 Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/569f5661 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/569f5661 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/569f5661 Branch: refs/heads/trunk Commit: 569f5661d4223f6eaf4d82f0771c9cac19883cfb Parents: 45b423b Author: Miklos Gergely <[email protected]> Authored: Wed Feb 22 13:17:03 2017 +0100 Committer: Miklos Gergely <[email protected]> Committed: Wed Feb 22 13:17:03 2017 +0100 ---------------------------------------------------------------------- .../src/test/python/stacks/2.4/LOGSEARCH/test_logfeeder.py | 6 ++++++ .../src/test/python/stacks/2.4/LOGSEARCH/test_logsearch.py | 6 ++++++ 2 files changed, 12 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/569f5661/ambari-server/src/test/python/stacks/2.4/LOGSEARCH/test_logfeeder.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.4/LOGSEARCH/test_logfeeder.py b/ambari-server/src/test/python/stacks/2.4/LOGSEARCH/test_logfeeder.py index 064978b..0a7f074 100644 --- a/ambari-server/src/test/python/stacks/2.4/LOGSEARCH/test_logfeeder.py +++ b/ambari-server/src/test/python/stacks/2.4/LOGSEARCH/test_logfeeder.py @@ -60,6 +60,12 @@ class TestLogFeeder(RMFTestCase): mode=0644, content='' ) + self.assertResourceCalled('File', '/etc/ambari-logsearch-logfeeder/conf/keys/ks_pass.txt', + action = ['delete'] + ) + self.assertResourceCalled('File', '/etc/ambari-logsearch-logfeeder/conf/keys/ts_pass.txt', + action = ['delete'] + ) self.assertResourceCalled('PropertiesFile', '/etc/ambari-logsearch-logfeeder/conf/logfeeder.properties', properties={'hadoop.security.credential.provider.path': 'jceks://file/etc/ambari-logsearch-logfeeder/conf/logfeeder.jceks', 'logfeeder.checkpoint.folder': '/etc/ambari-logsearch-logfeeder/conf/checkpoints', http://git-wip-us.apache.org/repos/asf/ambari/blob/569f5661/ambari-server/src/test/python/stacks/2.4/LOGSEARCH/test_logsearch.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.4/LOGSEARCH/test_logsearch.py b/ambari-server/src/test/python/stacks/2.4/LOGSEARCH/test_logsearch.py index 587561a..b283a9f 100644 --- a/ambari-server/src/test/python/stacks/2.4/LOGSEARCH/test_logsearch.py +++ b/ambari-server/src/test/python/stacks/2.4/LOGSEARCH/test_logsearch.py @@ -76,6 +76,12 @@ class TestLogSearch(RMFTestCase): mode = 0644, content = '' ) + self.assertResourceCalled('File', '/etc/ambari-logsearch-portal/conf/keys/ks_pass.txt', + action = ['delete'] + ) + self.assertResourceCalled('File', '/etc/ambari-logsearch-portal/conf/keys/ts_pass.txt', + action = ['delete'] + ) self.assertResourceCalled('PropertiesFile', '/etc/ambari-logsearch-portal/conf/logsearch.properties', properties = {'hadoop.security.credential.provider.path': 'jceks://file/etc/ambari-logsearch-portal/conf/logsearch.jceks', 'logsearch.audit.logs.split.interval.mins': '1',
