Merge lp:~gandelman-a/charm-helpers/test_helpers into lp:charm-helpers

[Adam Gandelman]

Removes the redefinition of patch_open() and mock_open() across tests and uses those defined in tests/helpers.py

[James Page (james-page)]

review: Approve

=== modified file 'tests/contrib/network/test_ovs.py'
--- tests/contrib/network/test_ovs.py	2013-07-01 09:53:08 +0000
+++ tests/contrib/network/test_ovs.py	2013-09-23 17:30:00 +0000
@@ -1,27 +1,11 @@
-from contextlib import contextmanager
-from mock import patch, call, MagicMock
+from mock import patch, call
 from testtools import TestCase
 
+from tests.helpers import patch_open
+
 import charmhelpers.contrib.network.ovs as ovs
 
 
-@contextmanager
-def patch_open():
-    '''Patch open() to allow mocking both open() itself and the file that is
-    yielded.
-
-    Yields the mock for "open" and "file", respectively.'''
-    mock_open = MagicMock(spec=open)
-    mock_file = MagicMock(spec=file)
-
-    @contextmanager
-    def stub_open(*args, **kwargs):
-        mock_open(*args, **kwargs)
-        yield mock_file
-
-    with patch('__builtin__.open', stub_open):
-        yield mock_open, mock_file
-
 GOOD_CERT = '''Certificate:
     Data:
         Version: 1 (0x0)

=== modified file 'tests/contrib/openstack/test_os_contexts.py'
--- tests/contrib/openstack/test_os_contexts.py	2013-07-19 23:29:59 +0000
+++ tests/contrib/openstack/test_os_contexts.py	2013-09-23 17:30:00 +0000
@@ -1,31 +1,14 @@
 import unittest
 
+from tests.helpers import patch_open
+
 from mock import patch, MagicMock, call
 
-from contextlib import contextmanager
 from copy import copy
 
 import charmhelpers.contrib.openstack.context as context
 
 
-@contextmanager
-def patch_open():
-    '''Patch open() to allow mocking both open() itself and the file that is
-    yielded.
-
-    Yields the mock for "open" and "file", respectively.'''
-    mock_open = MagicMock(spec=open)
-    mock_file = MagicMock(spec=file)
-
-    @contextmanager
-    def stub_open(*args, **kwargs):
-        mock_open(*args, **kwargs)
-        yield mock_file
-
-    with patch('__builtin__.open', stub_open):
-        yield mock_open, mock_file
-
-
 class FakeRelation(object):
     '''
     A fake relation class. Lets tests specify simple relation data

=== modified file 'tests/core/test_host.py'
--- tests/core/test_host.py	2013-09-23 10:50:53 +0000
+++ tests/core/test_host.py	2013-09-23 17:30:00 +0000
@@ -1,10 +1,10 @@
 from collections import OrderedDict
-from contextlib import contextmanager
 import subprocess
-import io
 
-from mock import patch, call, MagicMock
+from mock import patch, call
 from testtools import TestCase
+from tests.helpers import patch_open
+from tests.helpers import mock_open as mocked_open
 
 from charmhelpers.core import host
 
@@ -25,36 +25,6 @@
 '''
 
 
-@contextmanager
-def patch_open():
-    '''Patch open() to allow mocking both open() itself and the file that is
-    yielded.
-
-    Yields the mock for "open" and "file", respectively.'''
-    mock_open = MagicMock(spec=open)
-    mock_file = MagicMock(spec=file)
-
-    @contextmanager
-    def stub_open(*args, **kwargs):
-        mock_open(*args, **kwargs)
-        yield mock_file
-
-    with patch('__builtin__.open', stub_open):
-        yield mock_open, mock_file
-
-
-@contextmanager
-def mock_open(filename, contents=None):
-    ''' Slightly simpler mock of open to return contents for filename '''
-    def mock_file(*args):
-        if args[0] == filename:
-            return io.StringIO(contents)
-        else:
-            return open(*args)
-    with patch('__builtin__.open', mock_file):
-        yield
-
-
 class HelpersTest(TestCase):
     @patch('subprocess.call')
     def test_runs_service_action(self, mock_call):
@@ -130,7 +100,6 @@
 
         service.assert_called_with('reload', service_name)
 
-
     @patch.object(host, 'service')
     def test_start_a_service_fails(self, service):
         service_name = 'foo-service'
@@ -661,7 +630,7 @@
             "DISTRIB_DESCRIPTION": "\"Ubuntu Saucy Salamander "
                                    "(development branch)\""
         }
-        with mock_open('/etc/lsb-release', LSB_RELEASE):
+        with mocked_open('/etc/lsb-release', LSB_RELEASE):
             lsb_release = host.lsb_release()
             for key in result:
                 print lsb_release

=== modified file 'tests/fetch/test_fetch.py'
--- tests/fetch/test_fetch.py	2013-08-21 15:45:53 +0000
+++ tests/fetch/test_fetch.py	2013-09-23 17:30:00 +0000
@@ -1,4 +1,4 @@
-from contextlib import contextmanager
+from tests.helpers import patch_open
 from testtools import TestCase
 from mock import (
     patch,
@@ -36,24 +36,6 @@
     return cache
 
 
-@contextmanager
-def patch_open():
-    '''Patch open() to allow mocking both open() itself and the file that is
-    yielded.
-
-    Yields the mock for "open" and "file", respectively.'''
-    mock_open = MagicMock(spec=open)
-    mock_file = MagicMock(spec=file)
-
-    @contextmanager
-    def stub_open(*args, **kwargs):
-        mock_open(*args, **kwargs)
-        yield mock_file
-
-    with patch('__builtin__.open', stub_open):
-        yield mock_open, mock_file
-
-
 class FetchTest(TestCase):
     @patch('apt_pkg.Cache')
     def test_filter_packages_missing(self, cache):