From: Alfredo Deza Date: Tue, 29 Oct 2013 13:36:32 +0000 (-0400) Subject: fix failing tests X-Git-Tag: v1.3~6^2 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=390bdf5bd09356fa7ca119d1f2e14a38e6c4c7a6;p=ceph-deploy.git fix failing tests Signed-off-by: Alfredo Deza --- diff --git a/ceph_deploy/tests/test_mon.py b/ceph_deploy/tests/test_mon.py index 35a1298..b9203e6 100644 --- a/ceph_deploy/tests/test_mon.py +++ b/ceph_deploy/tests/test_mon.py @@ -34,7 +34,7 @@ class TestCatchCommonErrors(object): def test_warn_if_no_intial_members(self): fake_conn = make_fake_conn() cfg = make_fake_conf() - mon.catch_mon_errors(fake_conn, self.logger, 'host', cfg) + mon.catch_mon_errors(fake_conn, self.logger, 'host', cfg, Mock()) expected_msg = 'is not defined in `mon initial members`' self.assert_logger_message(self.logger.warning, expected_msg) @@ -43,15 +43,14 @@ class TestCatchCommonErrors(object): cfg = make_fake_conf() cfg.add_section('global') cfg.set('global', 'mon initial members', 'AAAA') - mon.catch_mon_errors(fake_conn, self.logger, 'host', cfg) + mon.catch_mon_errors(fake_conn, self.logger, 'host', cfg, Mock()) expected_msg = 'is not defined in `mon initial members`' self.assert_logger_message(self.logger.warning, expected_msg) - def test_warn_if_not_mon_in_monmap(self): fake_conn = make_fake_conn() cfg = make_fake_conf() - mon.catch_mon_errors(fake_conn, self.logger, 'host', cfg) + mon.catch_mon_errors(fake_conn, self.logger, 'host', cfg, Mock()) expected_msg = 'does not exist in monmap' self.assert_logger_message(self.logger.warning, expected_msg) @@ -59,6 +58,6 @@ class TestCatchCommonErrors(object): fake_conn = make_fake_conn() cfg = make_fake_conf() cfg.add_section('global') - mon.catch_mon_errors(fake_conn, self.logger, 'host', cfg) + mon.catch_mon_errors(fake_conn, self.logger, 'host', cfg, Mock()) expected_msg = 'neither `public_addr` nor `public_network`' self.assert_logger_message(self.logger.warning, expected_msg)