From: Alfredo Deza Date: Tue, 4 Mar 2014 18:09:54 +0000 (-0500) Subject: move the mock_open util to fakes X-Git-Tag: v1.4.0~8^2~4 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=a6f5eeaf714a9120c4d39d929fa71cc092a2b9bf;p=ceph-deploy.git move the mock_open util to fakes Signed-off-by: Alfredo Deza --- diff --git a/ceph_deploy/tests/unit/test_mon.py b/ceph_deploy/tests/unit/test_mon.py index 1f8b856..0bfa442 100644 --- a/ceph_deploy/tests/unit/test_mon.py +++ b/ceph_deploy/tests/unit/test_mon.py @@ -2,11 +2,11 @@ import sys import py.test from mock import Mock, MagicMock, patch, call from ceph_deploy import mon +from ceph_deploy.tests import fakes from ceph_deploy.hosts.common import mon_create from ceph_deploy.misc import mon_hosts, remote_shortname - def path_exists(target_paths=None): """ A quick helper that enforces a check for the existence of a path. Since we @@ -20,23 +20,6 @@ def path_exists(target_paths=None): return exists -def mock_open(mock=None, data=None): - """ - Fake the behavior of `open` when used as a context manager - """ - if mock is None: - mock = MagicMock(spec=file) - - handle = MagicMock(spec=file) - handle.write.return_value = None - if data is None: - handle.__enter__.return_value = handle - else: - handle.__enter__.return_value = data - mock.return_value = handle - return mock - - @py.test.mark.skipif(reason='failing due to removal of pushy') class TestCreateMon(object): @@ -47,7 +30,7 @@ class TestCreateMon(object): self.socket = Mock() self.socket.gethostname.return_value = 'hostname' self.fake_write = Mock(name='fake_write') - self.fake_file = mock_open(data=self.fake_write) + self.fake_file = fakes.mock_open(data=self.fake_write) self.fake_file.readline.return_value = self.fake_file self.fake_file.readline.lstrip.return_value = '' self.distro = Mock()