Conversion from mocker to mock completed.

5 files changed, 86 insertions, 69 deletions

diff --git a/tests/unittests/test_handler/test_handler_growpart.py b/tests/unittests/test_handler/test_handler_growpart.py
index 3056320d..89727863 100644
--- a/tests/unittests/test_handler/test_handler_growpart.py
+++ b/tests/unittests/test_handler/test_handler_growpart.py
@@ -1,5 +1,3 @@
-from mocker import MockerTestCase
-
 from cloudinit import cloud
 from cloudinit import util
 
@@ -9,6 +7,16 @@ import errno
 import logging
 import os
 import re
+import unittest
+
+try:
+    from unittest import mock
+except ImportError:
+    import mock
+try:
+    from contextlib import ExitStack
+except ImportError:
+    from contextlib2 import ExitStack
 
 # growpart:
 #   mode: auto  # off, on, auto, 'growpart'
@@ -42,7 +50,7 @@ growpart disk partition
 """
 
 
-class TestDisabled(MockerTestCase):
+class TestDisabled(unittest.TestCase):
     def setUp(self):
         super(TestDisabled, self).setUp()
         self.name = "growpart"
@@ -57,14 +65,14 @@ class TestDisabled(MockerTestCase):
 
         # this really only verifies that resizer_factory isn't called
         config = {'growpart': {'mode': 'off'}}
-        self.mocker.replace(cc_growpart.resizer_factory,
-                            passthrough=False)
-        self.mocker.replay()
 
-        self.handle(self.name, config, self.cloud_init, self.log, self.args)
+        with mock.patch.object(cc_growpart, 'resizer_factory') as mockobj:
+            self.handle(self.name, config, self.cloud_init, self.log,
+                        self.args)
+            self.assertEqual(mockobj.call_count, 0)
 
 
-class TestConfig(MockerTestCase):
+class TestConfig(unittest.TestCase):
     def setUp(self):
         super(TestConfig, self).setUp()
         self.name = "growpart"
@@ -77,69 +85,70 @@ class TestConfig(MockerTestCase):
         self.cloud_init = None
         self.handle = cc_growpart.handle
 
-        # Order must be correct
-        self.mocker.order()
-
     def test_no_resizers_auto_is_fine(self):
-        subp = self.mocker.replace(util.subp, passthrough=False)
-        subp(['growpart', '--help'], env={'LANG': 'C'})
-        self.mocker.result((HELP_GROWPART_NO_RESIZE, ""))
-        self.mocker.replay()
+        with mock.patch.object(
+                util, 'subp',
+                return_value=(HELP_GROWPART_NO_RESIZE, "")) as mockobj:
 
-        config = {'growpart': {'mode': 'auto'}}
-        self.handle(self.name, config, self.cloud_init, self.log, self.args)
+            config = {'growpart': {'mode': 'auto'}}
+            self.handle(self.name, config, self.cloud_init, self.log,
+                        self.args)
+
+            mockobj.assert_called_once_with(
+                ['growpart', '--help'], env={'LANG': 'C'})
 
     def test_no_resizers_mode_growpart_is_exception(self):
-        subp = self.mocker.replace(util.subp, passthrough=False)
-        subp(['growpart', '--help'], env={'LANG': 'C'})
-        self.mocker.result((HELP_GROWPART_NO_RESIZE, ""))
-        self.mocker.replay()
+        with mock.patch.object(
+                util, 'subp',
+                return_value=(HELP_GROWPART_NO_RESIZE, "")) as mockobj:
+            config = {'growpart': {'mode': "growpart"}}
+            self.assertRaises(
+                ValueError, self.handle, self.name, config,
+                self.cloud_init, self.log, self.args)
 
-        config = {'growpart': {'mode': "growpart"}}
-        self.assertRaises(ValueError, self.handle, self.name, config,
-                          self.cloud_init, self.log, self.args)
+            mockobj.assert_called_once_with(
+                ['growpart', '--help'], env={'LANG': 'C'})
 
     def test_mode_auto_prefers_growpart(self):
-        subp = self.mocker.replace(util.subp, passthrough=False)
-        subp(['growpart', '--help'], env={'LANG': 'C'})
-        self.mocker.result((HELP_GROWPART_RESIZE, ""))
-        self.mocker.replay()
+        with mock.patch.object(
+                util, 'subp',
+                return_value=(HELP_GROWPART_RESIZE, "")) as mockobj:
+            ret = cc_growpart.resizer_factory(mode="auto")
+            self.assertIsInstance(ret, cc_growpart.ResizeGrowPart)
 
-        ret = cc_growpart.resizer_factory(mode="auto")
-        self.assertTrue(isinstance(ret, cc_growpart.ResizeGrowPart))
+            mockobj.assert_called_once_with(
+                ['growpart', '--help'], env={'LANG': 'C'})
 
     def test_handle_with_no_growpart_entry(self):
         # if no 'growpart' entry in config, then mode=auto should be used
 
         myresizer = object()
+        retval = (("/", cc_growpart.RESIZE.CHANGED, "my-message",),)
+
+        with ExitStack() as mocks:
+            factory = mocks.enter_context(
+                mock.patch.object(cc_growpart, 'resizer_factory',
+                                  return_value=myresizer))
+            rsdevs = mocks.enter_context(
+                mock.patch.object(cc_growpart, 'resize_devices',
+                                  return_value=retval))
+            mocks.enter_context(
+                mock.patch.object(cc_growpart, 'RESIZERS',
+                                  (('mysizer', object),)
+                                  ))
 
-        factory = self.mocker.replace(cc_growpart.resizer_factory,
-                                      passthrough=False)
-        rsdevs = self.mocker.replace(cc_growpart.resize_devices,
-                                     passthrough=False)
-        factory("auto")
-        self.mocker.result(myresizer)
-        rsdevs(myresizer, ["/"])
-        self.mocker.result((("/", cc_growpart.RESIZE.CHANGED, "my-message",),))
-        self.mocker.replay()
-
-        try:
-            orig_resizers = cc_growpart.RESIZERS
-            cc_growpart.RESIZERS = (('mysizer', object),)
             self.handle(self.name, {}, self.cloud_init, self.log, self.args)
-        finally:
-            cc_growpart.RESIZERS = orig_resizers
 
+            factory.assert_called_once_with('auto')
+            rsdevs.assert_called_once_with(myresizer, ['/'])
 
-class TestResize(MockerTestCase):
+
+class TestResize(unittest.TestCase):
     def setUp(self):
         super(TestResize, self).setUp()
         self.name = "growpart"
         self.log = logging.getLogger("TestResize")
 
-        # Order must be correct
-        self.mocker.order()
-
     def test_simple_devices(self):
         # test simple device list
         # this patches out devent2dev, os.stat, and device_part_info
diff --git a/tests/unittests/test_pathprefix2dict.py b/tests/unittests/test_pathprefix2dict.py
index 590c4b82..38a56dc2 100644
--- a/tests/unittests/test_pathprefix2dict.py
+++ b/tests/unittests/test_pathprefix2dict.py
@@ -1,13 +1,17 @@
 from cloudinit import util
 
-from mocker import MockerTestCase
 from .helpers import populate_dir
 
+import shutil
+import tempfile
+import unittest
 
-class TestPathPrefix2Dict(MockerTestCase):
+
+class TestPathPrefix2Dict(unittest.TestCase):
 
     def setUp(self):
-        self.tmp = self.makeDir()
+        self.tmp = tempfile.mkdtemp()
+        self.addCleanup(shutil.rmtree, self.tmp)
 
     def test_required_only(self):
         dirdata = {'f1': 'f1content', 'f2': 'f2content'}
diff --git a/tests/unittests/test_runs/test_merge_run.py b/tests/unittests/test_runs/test_merge_run.py
index 2d920eb8..d0ec36a9 100644
--- a/tests/unittests/test_runs/test_merge_run.py
+++ b/tests/unittests/test_runs/test_merge_run.py
@@ -4,14 +4,13 @@ import tempfile
 
 from .. import helpers
 
-from cloudinit.settings import (PER_INSTANCE)
+from cloudinit.settings import PER_INSTANCE
 from cloudinit import stages
 from cloudinit import util
 
 
 class TestMergeRun(helpers.FilesystemMockingTestCase):
     def _patchIn(self, root):
-        self.restore()
         self.patchOS(root)
         self.patchUtils(root)
 
diff --git a/tests/unittests/test_runs/test_simple_run.py b/tests/unittests/test_runs/test_simple_run.py
index 0279b8b0..e19e65cd 100644
--- a/tests/unittests/test_runs/test_simple_run.py
+++ b/tests/unittests/test_runs/test_simple_run.py
@@ -4,19 +4,17 @@ import tempfile
 
 from .. import helpers
 
-from cloudinit.settings import (PER_INSTANCE)
+from cloudinit.settings import PER_INSTANCE
 from cloudinit import stages
 from cloudinit import util
 
 
 class TestSimpleRun(helpers.FilesystemMockingTestCase):
     def _patchIn(self, root):
-        self.restore()
         self.patchOS(root)
         self.patchUtils(root)
 
     def _pp_root(self, root, repatch=True):
-        self.restore()
         for (dirpath, dirnames, filenames) in os.walk(root):
             print(dirpath)
             for f in filenames:
diff --git a/tests/unittests/test_util.py b/tests/unittests/test_util.py
index 5ac47b80..b1f5d62c 100644
--- a/tests/unittests/test_util.py
+++ b/tests/unittests/test_util.py
@@ -6,6 +6,12 @@ import tempfile
 
 from . import helpers
 import unittest
+import six
+
+try:
+    from unittest import mock
+except ImportError:
+    import mock
 
 from cloudinit import importer
 from cloudinit import util
@@ -128,23 +134,24 @@ class TestWriteFile(unittest.TestCase):
         with open(my_file, "w") as fp:
             fp.write("My Content")
 
-        import_mock = self.mocker.replace(importer.import_module,
-                                          passthrough=False)
-        import_mock('selinux')
-
         fake_se = FakeSelinux(my_file)
-        self.mocker.result(fake_se)
-        self.mocker.replay()
-        with util.SeLinuxGuard(my_file) as is_on:
-            self.assertTrue(is_on)
+
+        with mock.patch.object(importer, 'import_module',
+                               return_value=fake_se) as mockobj:
+            with util.SeLinuxGuard(my_file) as is_on:
+                self.assertTrue(is_on)
+
         self.assertEqual(1, len(fake_se.restored))
         self.assertEqual(my_file, fake_se.restored[0])
 
+        mockobj.assert_called_once_with('selinux')
 
-class TestDeleteDirContents(MockerTestCase):
+
+class TestDeleteDirContents(unittest.TestCase):
     def setUp(self):
         super(TestDeleteDirContents, self).setUp()
-        self.tmp = self.makeDir(prefix="unittest_")
+        self.tmp = tempfile.mkdtemp()
+        self.addCleanup(shutil.rmtree, self.tmp)
 
     def assertDirEmpty(self, dirname):
         self.assertEqual([], os.listdir(dirname))
@@ -248,8 +255,8 @@ class TestLoadYaml(unittest.TestCase):
                          self.mydefault)
 
     def test_python_unicode(self):
-        # complex type of python/unicde is explicitly allowed
-        myobj = {'1': unicode("FOOBAR")}
+        # complex type of python/unicode is explicitly allowed
+        myobj = {'1': six.text_type("FOOBAR")}
         safe_yaml = yaml.dump(myobj)
         self.assertEqual(util.load_yaml(blob=safe_yaml,
                                         default=self.mydefault),