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 BE942200B7A for ; Mon, 5 Sep 2016 21:21:59 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id BD09B160ABC; Mon, 5 Sep 2016 19:21:59 +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 DBBB6160AB0 for ; Mon, 5 Sep 2016 21:21:58 +0200 (CEST) Received: (qmail 5207 invoked by uid 500); 5 Sep 2016 19:21:58 -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 5198 invoked by uid 99); 5 Sep 2016 19:21:58 -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, 05 Sep 2016 19:21:58 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id B2A35E0105; Mon, 5 Sep 2016 19:21:57 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: vbrodetskyi@apache.org To: commits@ambari.apache.org Message-Id: <6160ef41f27748fdbbe63f773a97d645@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: ambari git commit: AMBARI-18273. Add logging to differentiate between ambari-server start/restart commands vs. other commands.(vbrodetskyi) Date: Mon, 5 Sep 2016 19:21:57 +0000 (UTC) archived-at: Mon, 05 Sep 2016 19:21:59 -0000 Repository: ambari Updated Branches: refs/heads/trunk 32e02482d -> 2a18fe4fe AMBARI-18273. Add logging to differentiate between ambari-server start/restart commands vs. other commands.(vbrodetskyi) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/2a18fe4f Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/2a18fe4f Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/2a18fe4f Branch: refs/heads/trunk Commit: 2a18fe4feaf3ff1c75c77c443f40f2cfc79a0677 Parents: 32e0248 Author: Vitaly Brodetskyi Authored: Mon Sep 5 22:21:44 2016 +0300 Committer: Vitaly Brodetskyi Committed: Mon Sep 5 22:21:44 2016 +0300 ---------------------------------------------------------------------- .../src/test/python/TestAmbariServer.py | 41 +++++++++++++++----- 1 file changed, 31 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/2a18fe4f/ambari-server/src/test/python/TestAmbariServer.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/TestAmbariServer.py b/ambari-server/src/test/python/TestAmbariServer.py index f6bf685..37af554 100644 --- a/ambari-server/src/test/python/TestAmbariServer.py +++ b/ambari-server/src/test/python/TestAmbariServer.py @@ -295,7 +295,9 @@ class TestAmbariServer(TestCase): @patch.object(_ambari_server_, "setup_security") @patch("optparse.OptionParser") @patch.object(_ambari_server_, "logger") - def test_main_test_setup_security(self, logger_mock, OptionParserMock, + @patch("ambari_server.serverConfiguration.get_ambari_properties") + @patch.object(_ambari_server_, "setup_logging") + def test_main_test_setup_security(self, setup_logging_mock, get_ambari_properties_mock, logger_mock, OptionParserMock, setup_security_method): opm = OptionParserMock.return_value options = MagicMock() @@ -393,7 +395,9 @@ class TestAmbariServer(TestCase): @patch.object(_ambari_server_, "reset") @patch("optparse.OptionParser") @patch.object(_ambari_server_, "logger") - def test_main_test_setup(self, logger_mock, OptionParserMock, reset_method, stop_method, + @patch("ambari_server.serverConfiguration.get_ambari_properties") + @patch.object(_ambari_server_, "setup_logging") + def test_main_test_setup(self, setup_logging_mock, get_ambari_properties_mock, logger_mock, OptionParserMock, reset_method, stop_method, start_method, setup_method, exit_mock): opm = OptionParserMock.return_value options = self._create_empty_options_mock() @@ -459,7 +463,9 @@ class TestAmbariServer(TestCase): @patch.object(_ambari_server_, "setup") @patch("optparse.OptionParser") @patch.object(_ambari_server_, "logger") - def test_main_with_preset_dbms(self, logger_mock, optionParserMock, setup_method): + @patch("ambari_server.serverConfiguration.get_ambari_properties") + @patch.object(_ambari_server_, "setup_logging") + def test_main_with_preset_dbms(self, setup_logging_mock, get_ambari_properties_mock, logger_mock, optionParserMock, setup_method): opm = optionParserMock.return_value options = self._create_empty_options_mock() args = ["setup"] @@ -478,7 +484,10 @@ class TestAmbariServer(TestCase): @patch.object(_ambari_server_, "fix_database_options") @patch("optparse.OptionParser") @patch.object(_ambari_server_, "logger") - def test_fix_database_options_called(self, logger_mock, optionParserMock, fixDBOptionsMock, setup_method): + @patch("ambari_server.serverConfiguration.get_ambari_properties") + @patch.object(_ambari_server_, "setup_logging") + def test_fix_database_options_called(self, setup_logging_mock, get_ambari_properties_mock, logger_mock, optionParserMock, + fixDBOptionsMock, setup_method): opm = optionParserMock.return_value options = self._create_empty_options_mock() args = ["setup"] @@ -498,7 +507,9 @@ class TestAmbariServer(TestCase): @patch.object(_ambari_server_, "reset") @patch("optparse.OptionParser") @patch.object(_ambari_server_, "logger") - def test_main_test_start(self, logger_mock, optionParserMock, reset_method, stop_method, + @patch("ambari_server.serverConfiguration.get_ambari_properties") + @patch.object(_ambari_server_, "setup_logging") + def test_main_test_start(self, setup_logging_mock, get_ambari_properties_mock, logger_mock, optionParserMock, reset_method, stop_method, start_method, setup_method): opm = optionParserMock.return_value options = self._create_empty_options_mock() @@ -629,7 +640,9 @@ class TestAmbariServer(TestCase): @patch.object(_ambari_server_, "restore") @patch("optparse.OptionParser") @patch.object(_ambari_server_, "logger") - def test_main_test_backup(self, logger_mock, optionParserMock, restore_mock, backup_mock, reset_method, stop_method, + @patch("ambari_server.serverConfiguration.get_ambari_properties") + @patch.object(_ambari_server_, "setup_logging") + def test_main_test_backup(self, setup_logging_mock, get_ambari_properties_mock, logger_mock, optionParserMock, restore_mock, backup_mock, reset_method, stop_method, start_method, setup_method): opm = optionParserMock.return_value options = self._create_empty_options_mock() @@ -662,7 +675,9 @@ class TestAmbariServer(TestCase): @patch.object(_ambari_server_, "restore") @patch("optparse.OptionParser") @patch.object(_ambari_server_, "logger") - def test_main_test_restore(self, logger_mock, optionParserMock, restore_mock, backup_mock, reset_method, stop_method, + @patch("ambari_server.serverConfiguration.get_ambari_properties") + @patch.object(_ambari_server_, "setup_logging") + def test_main_test_restore(self, setup_logging_mock, get_ambari_properties_mock, logger_mock, optionParserMock, restore_mock, backup_mock, reset_method, stop_method, start_method, setup_method): opm = optionParserMock.return_value options = self._create_empty_options_mock() @@ -756,7 +771,9 @@ class TestAmbariServer(TestCase): @patch.object(_ambari_server_, "reset") @patch("optparse.OptionParser") @patch.object(_ambari_server_, "logger") - def test_main_test_reset(self, logger_mock, optionParserMock, reset_method, stop_method, + @patch("ambari_server.serverConfiguration.get_ambari_properties") + @patch.object(_ambari_server_, "setup_logging") + def test_main_test_reset(self, setup_logging_mock, get_ambari_properties_mock, logger_mock, optionParserMock, reset_method, stop_method, start_method, setup_method): opm = optionParserMock.return_value @@ -8489,7 +8506,9 @@ class TestAmbariServer(TestCase): @patch.object(_ambari_server_, "is_server_runing") @patch("optparse.OptionParser") @patch.object(_ambari_server_, "logger") - def test_main_test_status_running(self, logger_mock, optionParserMock, is_server_runing_method): + @patch("ambari_server.serverConfiguration.get_ambari_properties") + @patch.object(_ambari_server_, "setup_logging") + def test_main_test_status_running(self, setup_logging_mock, get_ambari_properties_mock, logger_mock, optionParserMock, is_server_runing_method): opm = optionParserMock.return_value options = self._create_empty_options_mock() del options.exit_message @@ -8516,7 +8535,9 @@ class TestAmbariServer(TestCase): @patch.object(_ambari_server_, "is_server_runing") @patch("optparse.OptionParser") @patch.object(_ambari_server_, "logger") - def test_main_test_status_not_running(self, logger_mock, optionParserMock, is_server_runing_method): + @patch("ambari_server.serverConfiguration.get_ambari_properties") + @patch.object(_ambari_server_, "setup_logging") + def test_main_test_status_not_running(self, setup_logging_mock, get_ambari_properties_mock, logger_mock, optionParserMock, is_server_runing_method): opm = optionParserMock.return_value options = self._create_empty_options_mock() del options.exit_message