1 files changed, 40 insertions, 44 deletions

diff --git a/tests/unittests/helpers.py b/tests/unittests/helpers.py
index 52305397..828579e8 100644
--- a/tests/unittests/helpers.py
+++ b/tests/unittests/helpers.py
@@ -1,17 +1,23 @@
 import os
 import sys
+import shutil
+import tempfile
 import unittest
 
-from contextlib import contextmanager
+import six
 
-from mocker import Mocker
-from mocker import MockerTestCase
+try:
+    from unittest import mock
+except ImportError:
+    import mock
+try:
+    from contextlib import ExitStack
+except ImportError:
+    from contextlib2 import ExitStack
 
 from cloudinit import helpers as ch
 from cloudinit import util
 
-import shutil
-
 # Used for detecting different python versions
 PY2 = False
 PY26 = False
@@ -60,7 +66,7 @@ if PY26:
         def assertDictContainsSubset(self, expected, actual, msg=None):
             missing = []
             mismatched = []
-            for k, v in expected.iteritems():
+            for k, v in expected.items():
                 if k not in actual:
                     missing.append(k)
                 elif actual[k] != v:
@@ -86,17 +92,6 @@ else:
         pass
 
 
-@contextmanager
-def mocker(verify_calls=True):
-    m = Mocker()
-    try:
-        yield m
-    finally:
-        m.restore()
-        if verify_calls:
-            m.verify()
-
-
 # Makes the old path start
 # with new base instead of whatever
 # it previously had
@@ -121,14 +116,19 @@ def retarget_many_wrapper(new_base, am, old_func):
             nam = len(n_args)
         for i in range(0, nam):
             path = args[i]
-            n_args[i] = rebase_path(path, new_base)
+            # patchOS() wraps various os and os.path functions, however in
+            # Python 3 some of these now accept file-descriptors (integers).
+            # That breaks rebase_path() so in lieu of a better solution, just
+            # don't rebase if we get a fd.
+            if isinstance(path, six.string_types):
+                n_args[i] = rebase_path(path, new_base)
         return old_func(*n_args, **kwds)
     return wrapper
 
 
-class ResourceUsingTestCase(MockerTestCase):
-    def __init__(self, methodName="runTest"):
-        MockerTestCase.__init__(self, methodName)
+class ResourceUsingTestCase(unittest.TestCase):
+    def setUp(self):
+        unittest.TestCase.setUp(self)
         self.resource_path = None
 
     def resourceLocation(self, subname=None):
@@ -156,17 +156,23 @@ class ResourceUsingTestCase(MockerTestCase):
             return fh.read()
 
     def getCloudPaths(self):
+        tmpdir = tempfile.mkdtemp()
+        self.addCleanup(shutil.rmtree, tmpdir)
         cp = ch.Paths({
-            'cloud_dir': self.makeDir(),
+            'cloud_dir': tmpdir,
             'templates_dir': self.resourceLocation(),
         })
         return cp
 
 
 class FilesystemMockingTestCase(ResourceUsingTestCase):
-    def __init__(self, methodName="runTest"):
-        ResourceUsingTestCase.__init__(self, methodName)
-        self.patched_funcs = []
+    def setUp(self):
+        ResourceUsingTestCase.setUp(self)
+        self.patched_funcs = ExitStack()
+
+    def tearDown(self):
+        self.patched_funcs.close()
+        ResourceUsingTestCase.tearDown(self)
 
     def replicateTestRoot(self, example_root, target_root):
         real_root = self.resourceLocation()
@@ -180,15 +186,6 @@ class FilesystemMockingTestCase(ResourceUsingTestCase):
                 make_path = util.abs_join(make_path, f)
                 shutil.copy(real_path, make_path)
 
-    def tearDown(self):
-        self.restore()
-        ResourceUsingTestCase.tearDown(self)
-
-    def restore(self):
-        for (mod, f, func) in self.patched_funcs:
-            setattr(mod, f, func)
-        self.patched_funcs = []
-
     def patchUtils(self, new_root):
         patch_funcs = {
             util: [('write_file', 1),
@@ -205,8 +202,8 @@ class FilesystemMockingTestCase(ResourceUsingTestCase):
             for (f, am) in funcs:
                 func = getattr(mod, f)
                 trap_func = retarget_many_wrapper(new_root, am, func)
-                setattr(mod, f, trap_func)
-                self.patched_funcs.append((mod, f, func))
+                self.patched_funcs.enter_context(
+                    mock.patch.object(mod, f, trap_func))
 
         # Handle subprocess calls
         func = getattr(util, 'subp')
@@ -214,16 +211,15 @@ class FilesystemMockingTestCase(ResourceUsingTestCase):
         def nsubp(*_args, **_kwargs):
             return ('', '')
 
-        setattr(util, 'subp', nsubp)
-        self.patched_funcs.append((util, 'subp', func))
+        self.patched_funcs.enter_context(
+            mock.patch.object(util, 'subp', nsubp))
 
         def null_func(*_args, **_kwargs):
             return None
 
         for f in ['chownbyid', 'chownbyname']:
-            func = getattr(util, f)
-            setattr(util, f, null_func)
-            self.patched_funcs.append((util, f, func))
+            self.patched_funcs.enter_context(
+                mock.patch.object(util, f, null_func))
 
     def patchOS(self, new_root):
         patch_funcs = {
@@ -234,8 +230,8 @@ class FilesystemMockingTestCase(ResourceUsingTestCase):
             for f in funcs:
                 func = getattr(mod, f)
                 trap_func = retarget_many_wrapper(new_root, 1, func)
-                setattr(mod, f, trap_func)
-                self.patched_funcs.append((mod, f, func))
+                self.patched_funcs.enter_context(
+                    mock.patch.object(mod, f, trap_func))
 
 
 class HttprettyTestCase(TestCase):
@@ -256,7 +252,7 @@ class HttprettyTestCase(TestCase):
 def populate_dir(path, files):
     if not os.path.exists(path):
         os.makedirs(path)
-    for (name, content) in files.iteritems():
+    for (name, content) in files.items():
         with open(os.path.join(path, name), "w") as fp:
             fp.write(content)
             fp.close()