Updated Branches: refs/heads/trunk a1394c581 -> 2b29a425e
AMBARI-3633. fix ambari server unit tests on Ubuntu (Aprit Gupta via dsen) Project: http://git-wip-us.apache.org/repos/asf/incubator-ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ambari/commit/2b29a425 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ambari/tree/2b29a425 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ambari/diff/2b29a425 Branch: refs/heads/trunk Commit: 2b29a425e76feffa3cecd20eb1b8b0888942ce1b Parents: a1394c5 Author: Dmitry Sen <[email protected]> Authored: Thu Oct 31 19:47:08 2013 +0200 Committer: Dmitry Sen <[email protected]> Committed: Thu Oct 31 19:47:08 2013 +0200 ---------------------------------------------------------------------- ambari-server/src/test/python/TestAmbariServer.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/2b29a425/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 f969c4b..946fa1c 100644 --- a/ambari-server/src/test/python/TestAmbariServer.py +++ b/ambari-server/src/test/python/TestAmbariServer.py @@ -1009,14 +1009,14 @@ class TestAmbariServer(TestCase): get_YN_input_mock.side_effect = [True] ambari_server.check_iptables() self.assertEqual(print_warning_msg.call_args_list[0][0][0], - "iptables is running. Confirm the necessary Ambari ports are accessible. " + + "%s is running. Confirm the necessary Ambari ports are accessible. " % ambari_server.FIREWALL_SERVICE_NAME + "Refer to the Ambari documentation for more details on ports." ) @patch.object(ambari_server, "run_os_command") @patch.object(ambari_server, "print_warning_msg") def test_check_iptables_is_not_running(self, print_warning_msg, run_os_command_mock): - run_os_command_mock.return_value = (3, "iptables: Firewall is not running.", "") + run_os_command_mock.return_value = (3, ambari_server.IP_TBLS_IS_NOT_RUNNING, "") ambari_server.check_iptables() self.assertFalse(print_warning_msg.called)
