More test ports from mocker to mock.

6 files changed, 24 insertions, 6 deletions

diff --git a/tests/unittests/test_handler/test_handler_chef.py b/tests/unittests/test_handler/test_handler_chef.py
index ef1aa208..b06a160c 100644
--- a/tests/unittests/test_handler/test_handler_chef.py
+++ b/tests/unittests/test_handler/test_handler_chef.py
@@ -12,6 +12,8 @@ from cloudinit.sources import DataSourceNone
 from .. import helpers as t_help
 
 import logging
+import shutil
+import tempfile
 
 LOG = logging.getLogger(__name__)
 
@@ -19,7 +21,8 @@ LOG = logging.getLogger(__name__)
 class TestChef(t_help.FilesystemMockingTestCase):
     def setUp(self):
         super(TestChef, self).setUp()
-        self.tmp = self.makeDir(prefix="unittest_")
+        self.tmp = tempfile.mkdtemp()
+        self.addCleanup(shutil.rmtree, self.tmp)
 
     def fetch_cloud(self, distro_kind):
         cls = distros.fetch(distro_kind)
diff --git a/tests/unittests/test_handler/test_handler_debug.py b/tests/unittests/test_handler/test_handler_debug.py
index 8891ca04..80708d7b 100644
--- a/tests/unittests/test_handler/test_handler_debug.py
+++ b/tests/unittests/test_handler/test_handler_debug.py
@@ -26,6 +26,8 @@ from cloudinit.sources import DataSourceNone
 from .. import helpers as t_help
 
 import logging
+import shutil
+import tempfile
 
 LOG = logging.getLogger(__name__)
 
@@ -33,7 +35,8 @@ LOG = logging.getLogger(__name__)
 class TestDebug(t_help.FilesystemMockingTestCase):
     def setUp(self):
         super(TestDebug, self).setUp()
-        self.new_root = self.makeDir(prefix="unittest_")
+        self.new_root = tempfile.mkdtemp()
+        self.addCleanup(shutil.rmtree, self.new_root)
 
     def _get_cloud(self, distro, metadata=None):
         self.patchUtils(self.new_root)
diff --git a/tests/unittests/test_handler/test_handler_locale.py b/tests/unittests/test_handler/test_handler_locale.py
index 690ef86f..de85eff6 100644
--- a/tests/unittests/test_handler/test_handler_locale.py
+++ b/tests/unittests/test_handler/test_handler_locale.py
@@ -32,6 +32,8 @@ from configobj import ConfigObj
 from six import BytesIO
 
 import logging
+import shutil
+import tempfile
 
 LOG = logging.getLogger(__name__)
 
@@ -39,7 +41,8 @@ LOG = logging.getLogger(__name__)
 class TestLocale(t_help.FilesystemMockingTestCase):
     def setUp(self):
         super(TestLocale, self).setUp()
-        self.new_root = self.makeDir(prefix="unittest_")
+        self.new_root = tempfile.mkdtemp()
+        self.addCleanup(shutil.rmtree, self.new_root)
 
     def _get_cloud(self, distro):
         self.patchUtils(self.new_root)
diff --git a/tests/unittests/test_handler/test_handler_set_hostname.py b/tests/unittests/test_handler/test_handler_set_hostname.py
index a9f7829b..d358b069 100644
--- a/tests/unittests/test_handler/test_handler_set_hostname.py
+++ b/tests/unittests/test_handler/test_handler_set_hostname.py
@@ -7,6 +7,8 @@ from cloudinit import util
 
 from .. import helpers as t_help
 
+import shutil
+import tempfile
 import logging
 
 from six import BytesIO
@@ -19,7 +21,8 @@ LOG = logging.getLogger(__name__)
 class TestHostname(t_help.FilesystemMockingTestCase):
     def setUp(self):
         super(TestHostname, self).setUp()
-        self.tmp = self.makeDir(prefix="unittest_")
+        self.tmp = tempfile.mkdtemp()
+        self.addCleanup(shutil.rmtree, self.tmp)
 
     def _fetch_distro(self, kind):
         cls = distros.fetch(kind)
diff --git a/tests/unittests/test_handler/test_handler_timezone.py b/tests/unittests/test_handler/test_handler_timezone.py
index 10ea2040..e3df8759 100644
--- a/tests/unittests/test_handler/test_handler_timezone.py
+++ b/tests/unittests/test_handler/test_handler_timezone.py
@@ -31,6 +31,8 @@ from configobj import ConfigObj
 
 from six import BytesIO
 
+import shutil
+import tempfile
 import logging
 
 LOG = logging.getLogger(__name__)
@@ -39,7 +41,8 @@ LOG = logging.getLogger(__name__)
 class TestTimezone(t_help.FilesystemMockingTestCase):
     def setUp(self):
         super(TestTimezone, self).setUp()
-        self.new_root = self.makeDir(prefix="unittest_")
+        self.new_root = tempfile.mkdtemp()
+        self.addCleanup(shutil.rmtree, self.new_root)
 
     def _get_cloud(self, distro):
         self.patchUtils(self.new_root)
diff --git a/tests/unittests/test_handler/test_handler_yum_add_repo.py b/tests/unittests/test_handler/test_handler_yum_add_repo.py
index 81806ad1..3a8aa7c1 100644
--- a/tests/unittests/test_handler/test_handler_yum_add_repo.py
+++ b/tests/unittests/test_handler/test_handler_yum_add_repo.py
@@ -4,6 +4,8 @@ from cloudinit.config import cc_yum_add_repo
 
 from .. import helpers
 
+import shutil
+import tempfile
 import logging
 
 from six import BytesIO
@@ -16,7 +18,8 @@ LOG = logging.getLogger(__name__)
 class TestConfig(helpers.FilesystemMockingTestCase):
     def setUp(self):
         super(TestConfig, self).setUp()
-        self.tmp = self.makeDir(prefix="unittest_")
+        self.tmp = tempfile.mkdtemp()
+        self.addCleanup(shutil.rmtree, self.tmp)
 
     def test_bad_config(self):
         cfg = {