Merge lp:~chad.smith/curtin/common-ci-test-case into lp:~curtin-dev/curtin/trunk

[Chad Smith]

tests: Add CiTestCase common parent for all curtin tests

This branch makes sure all unittests subclass from CiTestCase which provides all unit tests with an add_patch method for mocking as well as tmp_dir and tmp_path creation.

Drop any unittest-specific tempfile setup in favor of self.tmp_dir and self.tmp_path.

Also drop any duplicate add_patch method definitions and convert any mock start/stop logic to add_patch where possible.

tests: Add CiTestCase common parent for all curtin tests

This branch makes sure all unittests subclass from CiTestCase which provides all unit tests with an add_patch method for mocking as well as tmp_dir and tmp_path creation.

Drop any unittest-specific tempfile setup in favor of self.tmp_dir and self.tmp_path.

Also drop any duplicate add_patch method definitions and convert any mock start/stop logic to add_patch where possible.

[Server Team CI bot (server-team-bot)]

PASSED: Continuous integration, rev:517
https://jenkins.ubuntu.com/server/job/curtin-ci/580/
Executed test runs:
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=metal-amd64/580
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=metal-arm64/580
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=metal-ppc64el/580
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=metal-s390x/580
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=vm-i386/580

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/server/job/curtin-ci/580/rebuild

review: Approve (continuous-integration)

[Ryan Harper (raharper)]

Thanks for starting this.

I'd suggest also adding in the add_patch() which is repeated in many of the base classes in the unittests. It's fine if we punt that to a second MP after this lands as well.

Overall looks fine, couple of questions in line.

[Scott Moser (smoser)]

responded to ryan's comment in line. lets drop the functools.

[lp:~chad.smith/curtin/common-ci-test-case]

518. By Chad Smith on 2017-08-03

drop functools partial as it is unneeded

[Server Team CI bot (server-team-bot)]

PASSED: Continuous integration, rev:518
https://jenkins.ubuntu.com/server/job/curtin-ci/586/
Executed test runs:
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=metal-amd64/586
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=metal-arm64/586
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=metal-ppc64el/586
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=metal-s390x/586
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=vm-i386/586

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/server/job/curtin-ci/586/rebuild

review: Approve (continuous-integration)

[lp:~chad.smith/curtin/common-ci-test-case]

519. By Chad Smith on 2017-08-03

move add_patch up into CiTestCase, drop all add_patch definitions in subclasses. Convert any locally defined mock start/stop definitions to use add_patch

520. By Chad Smith on 2017-08-03

add missing super...setUp calls to classes which have overridden the unittest.setUp method

[Server Team CI bot (server-team-bot)]

FAILED: Continuous integration, rev:520
https://jenkins.ubuntu.com/server/job/curtin-ci/588/
Executed test runs:
    FAILURE: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=metal-amd64/588/console
    FAILURE: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=metal-arm64/588/console
    FAILURE: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=metal-ppc64el/588/console
    FAILURE: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=metal-s390x/588/console
    FAILURE: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=vm-i386/588/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/server/job/curtin-ci/588/rebuild

review: Needs Fixing (continuous-integration)

[Ryan Harper (raharper)]

Looks good once you make tox happy

[lp:~chad.smith/curtin/common-ci-test-case]

521. By Chad Smith on 2017-08-03

allow kwargs passed into CiTestCase.add_patch per review comments

[Server Team CI bot (server-team-bot)]

PASSED: Continuous integration, rev:521
https://jenkins.ubuntu.com/server/job/curtin-ci/589/
Executed test runs:
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=metal-amd64/589
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=metal-arm64/589
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=metal-ppc64el/589
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=metal-s390x/589
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=vm-i386/589

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/server/job/curtin-ci/589/rebuild

review: Approve (continuous-integration)

=== modified file 'tests/unittests/helpers.py'
--- tests/unittests/helpers.py	2016-11-30 22:57:10 +0000
+++ tests/unittests/helpers.py	2017-08-03 19:32:06 +0000
@@ -19,6 +19,10 @@
 import imp
 import importlib
 import mock
+import os
+import shutil
+import tempfile
+from unittest import TestCase
 
 
 def builtin_module_name():
@@ -43,3 +47,35 @@
     m_patch = '{}.open'.format(mod_name)
     with mock.patch(m_patch, m_open, create=True):
         yield m_open
+
+
+class CiTestCase(TestCase):
+    """Common testing class which all curtin unit tests subclass."""
+
+    def add_patch(self, target, attr, **kwargs):
+        """Patches specified target object and sets it as attr on test
+        instance also schedules cleanup"""
+        if 'autospec' not in kwargs:
+            kwargs['autospec'] = True
+        m = mock.patch(target, **kwargs)
+        p = m.start()
+        self.addCleanup(m.stop)
+        setattr(self, attr, p)
+
+    def tmp_dir(self, dir=None, cleanup=True):
+        """Return a full path to a temporary directory for the test run."""
+        if dir is None:
+            tmpd = tempfile.mkdtemp(
+                prefix="curtin-ci-%s." % self.__class__.__name__)
+        else:
+            tmpd = tempfile.mkdtemp(dir=dir)
+        self.addCleanup(shutil.rmtree, tmpd)
+        return tmpd
+
+    def tmp_path(self, path, _dir=None):
+        # return an absolute path to 'path' under dir.
+        # if dir is None, one will be created with tmp_dir()
+        # the file is not created or modified.
+        if _dir is None:
+            _dir = self.tmp_dir()
+        return os.path.normpath(os.path.abspath(os.path.join(_dir, path)))

=== modified file 'tests/unittests/test_apt_custom_sources_list.py'
--- tests/unittests/test_apt_custom_sources_list.py	2016-07-29 10:27:20 +0000
+++ tests/unittests/test_apt_custom_sources_list.py	2017-08-03 19:32:06 +0000
@@ -3,10 +3,7 @@
 """
 import logging
 import os
-import shutil
-import tempfile
 
-from unittest import TestCase
 
 import yaml
 import mock
@@ -14,6 +11,7 @@
 
 from curtin import util
 from curtin.commands import apt_config
+from .helpers import CiTestCase
 
 LOG = logging.getLogger(__name__)
 
@@ -85,12 +83,11 @@
 """)
 
 
-class TestAptSourceConfigSourceList(TestCase):
+class TestAptSourceConfigSourceList(CiTestCase):
     """TestAptSourceConfigSourceList - Class to test sources list rendering"""
     def setUp(self):
         super(TestAptSourceConfigSourceList, self).setUp()
-        self.new_root = tempfile.mkdtemp()
-        self.addCleanup(shutil.rmtree, self.new_root)
+        self.new_root = self.tmp_dir()
         # self.patchUtils(self.new_root)
 
     @staticmethod

=== modified file 'tests/unittests/test_apt_source.py'
--- tests/unittests/test_apt_source.py	2017-02-09 19:59:11 +0000
+++ tests/unittests/test_apt_source.py	2017-08-03 19:32:06 +0000
@@ -4,11 +4,8 @@
 import glob
 import os
 import re
-import shutil
 import socket
-import tempfile
 
-from unittest import TestCase
 
 import mock
 from mock import call
@@ -16,6 +13,7 @@
 from curtin import util
 from curtin import gpg
 from curtin.commands import apt_config
+from .helpers import CiTestCase
 
 
 EXPECTEDKEY = u"""-----BEGIN PGP PUBLIC KEY BLOCK-----
@@ -62,14 +60,13 @@
 ChrootableTargetStr = "curtin.commands.apt_config.util.ChrootableTarget"
 
 
-class TestAptSourceConfig(TestCase):
+class TestAptSourceConfig(CiTestCase):
     """ TestAptSourceConfig
     Main Class to test apt configs
     """
     def setUp(self):
         super(TestAptSourceConfig, self).setUp()
-        self.tmp = tempfile.mkdtemp()
-        self.addCleanup(shutil.rmtree, self.tmp)
+        self.tmp = self.tmp_dir()
         self.aptlistfile = os.path.join(self.tmp, "single-deb.list")
         self.aptlistfile2 = os.path.join(self.tmp, "single-deb2.list")
         self.aptlistfile3 = os.path.join(self.tmp, "single-deb3.list")
@@ -930,7 +927,7 @@
             orig, apt_config.disable_suites(["proposed"], orig, rel))
 
 
-class TestDebconfSelections(TestCase):
+class TestDebconfSelections(CiTestCase):
 
     @mock.patch("curtin.commands.apt_config.debconf_set_selections")
     def test_no_set_sel_if_none_to_set(self, m_set_sel):

=== modified file 'tests/unittests/test_basic.py'
--- tests/unittests/test_basic.py	2013-07-29 19:59:51 +0000
+++ tests/unittests/test_basic.py	2017-08-03 19:32:06 +0000
@@ -1,7 +1,7 @@
-from unittest import TestCase
-
-
-class TestImport(TestCase):
+from .helpers import CiTestCase
+
+
+class TestImport(CiTestCase):
     def test_import(self):
         import curtin
         self.assertFalse(getattr(curtin, 'BOGUS_ENTRY', None))

=== modified file 'tests/unittests/test_block.py'
--- tests/unittests/test_block.py	2017-05-22 20:10:23 +0000
+++ tests/unittests/test_block.py	2017-08-03 19:32:06 +0000
@@ -1,19 +1,16 @@
-from unittest import TestCase
 import functools
 import os
 import mock
-import tempfile
-import shutil
 import sys
 
 from collections import OrderedDict
 
-from .helpers import simple_mocked_open
+from .helpers import CiTestCase, simple_mocked_open
 from curtin import util
 from curtin import block
 
 
-class TestBlock(TestCase):
+class TestBlock(CiTestCase):
 
     @mock.patch("curtin.block.util")
     def test_get_volume_uuid(self, mock_util):
@@ -103,7 +100,7 @@
             block.lookup_disk(serial)
 
 
-class TestSysBlockPath(TestCase):
+class TestSysBlockPath(CiTestCase):
     @mock.patch("curtin.block.get_blockdev_for_partition")
     @mock.patch("os.path.exists")
     def test_existing_valid_devname(self, m_os_path_exists, m_get_blk):
@@ -177,19 +174,13 @@
                          block.sys_block_path('/dev/cciss/c0d0p1'))
 
 
-class TestWipeFile(TestCase):
+class TestWipeFile(CiTestCase):
     def __init__(self, *args, **kwargs):
         super(TestWipeFile, self).__init__(*args, **kwargs)
 
-    def tfile(self, *args):
-        # return a temp file in a dir that will be cleaned up
-        tmpdir = tempfile.mkdtemp()
-        self.addCleanup(shutil.rmtree, tmpdir)
-        return os.path.sep.join([tmpdir] + list(args))
-
     def test_non_exist_raises_file_not_found(self):
         try:
-            p = self.tfile("enofile")
+            p = self.tmp_path("enofile")
             block.wipe_file(p)
             raise Exception("%s did not raise exception" % p)
         except Exception as e:
@@ -198,7 +189,7 @@
 
     def test_non_exist_dir_raises_file_not_found(self):
         try:
-            p = self.tfile("enodir", "file")
+            p = self.tmp_path(os.path.sep.join(["enodir", "file"]))
             block.wipe_file(p)
             raise Exception("%s did not raise exception" % p)
         except Exception as e:
@@ -207,7 +198,7 @@
 
     def test_default_is_zero(self):
         flen = 1024
-        myfile = self.tfile("def_zero")
+        myfile = self.tmp_path("def_zero")
         util.write_file(myfile, flen * b'\1', omode="wb")
         block.wipe_file(myfile)
         found = util.load_file(myfile, decode=False)
@@ -219,7 +210,7 @@
         def reader(size):
             return size * b'\1'
 
-        myfile = self.tfile("reader_used")
+        myfile = self.tmp_path("reader_used")
         # populate with nulls
         util.write_file(myfile, flen * b'\0', omode="wb")
         block.wipe_file(myfile, reader=reader, buflen=flen)
@@ -236,15 +227,15 @@
             data['x'] = data['x'][size:]
             return buf
 
-        myfile = self.tfile("reader_twice")
+        myfile = self.tmp_path("reader_twice")
         util.write_file(myfile, flen * b'\xff', omode="wb")
         block.wipe_file(myfile, reader=reader, buflen=20)
         found = util.load_file(myfile, decode=False)
         self.assertEqual(found, expected)
 
     def test_reader_fhandle(self):
-        srcfile = self.tfile("fhandle_src")
-        trgfile = self.tfile("fhandle_trg")
+        srcfile = self.tmp_path("fhandle_src")
+        trgfile = self.tmp_path("fhandle_trg")
         data = '\n'.join(["this is source file." for f in range(0, 10)] + [])
         util.write_file(srcfile, data)
         util.write_file(trgfile, 'a' * len(data))
@@ -254,7 +245,7 @@
         self.assertEqual(data, found)
 
     def test_exclusive_open_raise_missing(self):
-        myfile = self.tfile("no-such-file")
+        myfile = self.tmp_path("no-such-file")
 
         with self.assertRaises(ValueError):
             with block.exclusive_open(myfile) as fp:
@@ -265,7 +256,7 @@
     @mock.patch('os.open')
     def test_exclusive_open(self, mock_os_open, mock_os_fdopen, mock_os_close):
         flen = 1024
-        myfile = self.tfile("my_exclusive_file")
+        myfile = self.tmp_path("my_exclusive_file")
         util.write_file(myfile, flen * b'\1', omode="wb")
         mock_fd = 3
         mock_os_open.return_value = mock_fd
@@ -288,7 +279,7 @@
                                                     mock_os_close,
                                                     mock_util_fuser):
         flen = 1024
-        myfile = self.tfile("my_exclusive_file")
+        myfile = self.tmp_path("my_exclusive_file")
         util.write_file(myfile, flen * b'\1', omode="wb")
         mock_os_open.side_effect = OSError("NO_O_EXCL")
         mock_holders.return_value = ['md1']
@@ -310,7 +301,7 @@
     def test_exclusive_open_fdopen_failure(self, mock_os_open,
                                            mock_os_fdopen, mock_os_close):
         flen = 1024
-        myfile = self.tfile("my_exclusive_file")
+        myfile = self.tmp_path("my_exclusive_file")
         util.write_file(myfile, flen * b'\1', omode="wb")
         mock_fd = 3
         mock_os_open.return_value = mock_fd
@@ -328,7 +319,7 @@
             self.assertEqual([], mock_os_close.call_args_list)
 
 
-class TestWipeVolume(TestCase):
+class TestWipeVolume(CiTestCase):
     dev = '/dev/null'
 
     @mock.patch('curtin.block.lvm')
@@ -366,7 +357,7 @@
             block.wipe_volume(self.dev, mode='invalidmode')
 
 
-class TestBlockKnames(TestCase):
+class TestBlockKnames(CiTestCase):
     """Tests for some of the kname functions in block"""
     def test_determine_partition_kname(self):
         part_knames = [(('sda', 1), 'sda1'),
@@ -430,7 +421,7 @@
                 block.kname_to_path(kname)
 
 
-class TestPartTableSignature(TestCase):
+class TestPartTableSignature(CiTestCase):
     blockdev = '/dev/null'
     dos_content = b'\x00' * 0x1fe + b'\x55\xAA' + b'\x00' * 0xf00
     gpt_content = b'\x00' * 0x200 + b'EFI PART' + b'\x00' * (0x200 - 8)
@@ -493,7 +484,7 @@
                     block.check_efi_signature(self.blockdev))
 
 
-class TestNonAscii(TestCase):
+class TestNonAscii(CiTestCase):
     @mock.patch('curtin.block.util.subp')
     def test_lsblk(self, mock_subp):
         # lsblk can write non-ascii data, causing shlex to blow up
@@ -519,14 +510,7 @@
         block.blkid()
 
 
-class TestSlaveKnames(TestCase):
-    def add_patch(self, target, attr, autospec=True):
-        """Patches specified target object and sets it as attr on test
-        instance also schedules cleanup"""
-        m = mock.patch(target, autospec=autospec)
-        p = m.start()
-        self.addCleanup(m.stop)
-        setattr(self, attr, p)
+class TestSlaveKnames(CiTestCase):
 
     def setUp(self):
         super(TestSlaveKnames, self).setUp()

=== modified file 'tests/unittests/test_block_iscsi.py'
--- tests/unittests/test_block_iscsi.py	2017-05-12 20:20:02 +0000
+++ tests/unittests/test_block_iscsi.py	2017-08-03 19:32:06 +0000
@@ -1,23 +1,11 @@
 import mock
 
-from unittest import TestCase
 from curtin.block import iscsi
-
-
-class IscsiTestBase(TestCase):
-    def setUp(self):
-        super(IscsiTestBase, self).setUp()
-
-    def add_patch(self, target, attr):
-        """Patches specified target object and sets it as attr on test
-        instance also schedules cleanup"""
-        m = mock.patch(target, autospec=True)
-        p = m.start()
-        self.addCleanup(m.stop)
-        setattr(self, attr, p)
-
-
-class TestBlockIscsiPortalParsing(IscsiTestBase):
+from .helpers import CiTestCase
+
+
+class TestBlockIscsiPortalParsing(CiTestCase):
+
     def test_iscsi_portal_parsing_string(self):
         with self.assertRaisesRegexp(ValueError, 'not a string'):
             iscsi.assert_valid_iscsi_portal(1234)
@@ -490,7 +478,7 @@
         self.assertEquals(i.target, 'iqn.2017-04.com.example.test:target-name')
 
 
-class TestBlockIscsiVolPath(IscsiTestBase):
+class TestBlockIscsiVolPath(CiTestCase):
     # non-iscsi backed disk returns false
     # regular iscsi-backed disk returns true
     # layered setup without an iscsi member returns false

=== modified file 'tests/unittests/test_block_lvm.py'
--- tests/unittests/test_block_lvm.py	2016-08-15 14:52:56 +0000
+++ tests/unittests/test_block_lvm.py	2017-08-03 19:32:06 +0000
@@ -1,10 +1,10 @@
 from curtin.block import lvm
 
-from unittest import TestCase
+from .helpers import CiTestCase
 import mock
 
 
-class TestBlockLvm(TestCase):
+class TestBlockLvm(CiTestCase):
     vg_name = 'ubuntu-volgroup'
 
     @mock.patch('curtin.block.lvm.util')

=== modified file 'tests/unittests/test_block_mdadm.py'
--- tests/unittests/test_block_mdadm.py	2017-05-08 20:38:48 +0000
+++ tests/unittests/test_block_mdadm.py	2017-08-03 19:32:06 +0000
@@ -1,27 +1,15 @@
-from unittest import TestCase
 from mock import call, patch
 from curtin.block import dev_short
 from curtin.block import mdadm
 from curtin import util
+from .helpers import CiTestCase
 import os
 import subprocess
 import textwrap
 
 
-class MdadmTestBase(TestCase):
-    def setUp(self):
-        super(MdadmTestBase, self).setUp()
-
-    def add_patch(self, target, attr):
-        """Patches specified target object and sets it as attr on test
-        instance also schedules cleanup"""
-        m = patch(target, autospec=True)
-        p = m.start()
-        self.addCleanup(m.stop)
-        setattr(self, attr, p)
-
-
-class TestBlockMdadmAssemble(MdadmTestBase):
+class TestBlockMdadmAssemble(CiTestCase):
+
     def setUp(self):
         super(TestBlockMdadmAssemble, self).setUp()
         self.add_patch('curtin.block.mdadm.util', 'mock_util')
@@ -94,7 +82,7 @@
             rcs=[0, 1, 2])
 
 
-class TestBlockMdadmCreate(MdadmTestBase):
+class TestBlockMdadmCreate(CiTestCase):
     def setUp(self):
         super(TestBlockMdadmCreate, self).setUp()
         self.add_patch('curtin.block.mdadm.util', 'mock_util')
@@ -243,7 +231,7 @@
         self.mock_util.subp.assert_has_calls(expected_calls)
 
 
-class TestBlockMdadmExamine(MdadmTestBase):
+class TestBlockMdadmExamine(CiTestCase):
     def setUp(self):
         super(TestBlockMdadmExamine, self).setUp()
         self.add_patch('curtin.block.mdadm.util', 'mock_util')
@@ -328,7 +316,7 @@
         self.assertEqual(data, {})
 
 
-class TestBlockMdadmStop(MdadmTestBase):
+class TestBlockMdadmStop(CiTestCase):
     def setUp(self):
         super(TestBlockMdadmStop, self).setUp()
         self.add_patch('curtin.block.mdadm.util.lsb_release', 'mock_util_lsb')
@@ -495,7 +483,7 @@
         self.mock_util_write_file.assert_has_calls(expected_writes)
 
 
-class TestBlockMdadmRemove(MdadmTestBase):
+class TestBlockMdadmRemove(CiTestCase):
     def setUp(self):
         super(TestBlockMdadmRemove, self).setUp()
         self.add_patch('curtin.block.mdadm.util', 'mock_util')
@@ -521,7 +509,7 @@
         self.mock_util.subp.assert_has_calls(expected_calls)
 
 
-class TestBlockMdadmQueryDetail(MdadmTestBase):
+class TestBlockMdadmQueryDetail(CiTestCase):
     def setUp(self):
         super(TestBlockMdadmQueryDetail, self).setUp()
         self.add_patch('curtin.block.mdadm.util', 'mock_util')
@@ -599,7 +587,7 @@
                          '93a73e10:427f280b:b7076c02:204b8f7a')
 
 
-class TestBlockMdadmDetailScan(MdadmTestBase):
+class TestBlockMdadmDetailScan(CiTestCase):
     def setUp(self):
         super(TestBlockMdadmDetailScan, self).setUp()
         self.add_patch('curtin.block.mdadm.util', 'mock_util')
@@ -634,7 +622,7 @@
         self.assertEqual(None, data)
 
 
-class TestBlockMdadmMdHelpers(MdadmTestBase):
+class TestBlockMdadmMdHelpers(CiTestCase):
     def setUp(self):
         super(TestBlockMdadmMdHelpers, self).setUp()
         self.add_patch('curtin.block.mdadm.util', 'mock_util')

=== modified file 'tests/unittests/test_block_mkfs.py'
--- tests/unittests/test_block_mkfs.py	2016-06-30 21:40:28 +0000
+++ tests/unittests/test_block_mkfs.py	2017-08-03 19:32:06 +0000
@@ -1,10 +1,10 @@
 from curtin.block import mkfs
 
-from unittest import TestCase
+from .helpers import CiTestCase
 import mock
 
 
-class TestBlockMkfs(TestCase):
+class TestBlockMkfs(CiTestCase):
     test_uuid = "fb26cc6c-ae73-11e5-9e38-2fb63f0c3155"
 
     def _get_config(self, fstype):

=== modified file 'tests/unittests/test_clear_holders.py'
--- tests/unittests/test_clear_holders.py	2017-05-30 15:27:14 +0000
+++ tests/unittests/test_clear_holders.py	2017-08-03 19:32:06 +0000
@@ -1,12 +1,12 @@
-from unittest import TestCase
 import mock
-
-from curtin.block import clear_holders
 import os
 import textwrap
 
-
-class TestClearHolders(TestCase):
+from curtin.block import clear_holders
+from .helpers import CiTestCase
+
+
+class TestClearHolders(CiTestCase):
     test_blockdev = '/dev/null'
     test_syspath = '/sys/class/block/null'
     remove_retries = [0.2] * 150  # clear_holders defaults to 30 seconds

=== modified file 'tests/unittests/test_commands_apply_net.py'
--- tests/unittests/test_commands_apply_net.py	2017-07-19 14:32:15 +0000
+++ tests/unittests/test_commands_apply_net.py	2017-08-03 19:32:06 +0000
@@ -1,26 +1,14 @@
-from unittest import TestCase
 from mock import patch, call
 import copy
 import os
 
 from curtin.commands import apply_net
 from curtin import util
-
-
-class ApplyNetTestBase(TestCase):
-    def setUp(self):
-        super(ApplyNetTestBase, self).setUp()
-
-    def add_patch(self, target, attr):
-        """Patches specified target object and sets it as attr on test
-        instance also schedules cleanup"""
-        m = patch(target, autospec=True)
-        p = m.start()
-        self.addCleanup(m.stop)
-        setattr(self, attr, p)
-
-
-class TestApplyNet(ApplyNetTestBase):
+from .helpers import CiTestCase
+
+
+class TestApplyNet(CiTestCase):
+
     def setUp(self):
         super(TestApplyNet, self).setUp()
 
@@ -150,7 +138,7 @@
         self.m_ipv6_mtu.assert_called_with(self.target)
 
 
-class TestApplyNetPatchIfupdown(ApplyNetTestBase):
+class TestApplyNetPatchIfupdown(CiTestCase):
 
     @patch('curtin.util.write_file')
     def test_apply_ipv6_mtu_hook(self, mock_write):
@@ -218,7 +206,7 @@
         self.assertEqual(0, mock_write.call_count)
 
 
-class TestApplyNetPatchIpv6Priv(ApplyNetTestBase):
+class TestApplyNetPatchIpv6Priv(CiTestCase):
 
     @patch('curtin.util.del_file')
     @patch('curtin.util.load_file')
@@ -274,7 +262,7 @@
         self.assertEqual(0, mock_load.call_count)
 
 
-class TestApplyNetRemoveLegacyEth0(ApplyNetTestBase):
+class TestApplyNetRemoveLegacyEth0(CiTestCase):
 
     @patch('curtin.util.del_file')
     @patch('curtin.util.load_file')

=== modified file 'tests/unittests/test_commands_block_meta.py'
--- tests/unittests/test_commands_block_meta.py	2017-03-22 15:34:21 +0000
+++ tests/unittests/test_commands_block_meta.py	2017-08-03 19:32:06 +0000
@@ -1,24 +1,11 @@
-from unittest import TestCase
 from mock import patch, call
 from argparse import Namespace
 
 from curtin.commands import block_meta
-
-
-class BlockMetaTestBase(TestCase):
-    def setUp(self):
-        super(BlockMetaTestBase, self).setUp()
-
-    def add_patch(self, target, attr):
-        """Patches specified target object and sets it as attr on test
-        instance also schedules cleanup"""
-        m = patch(target, autospec=True)
-        p = m.start()
-        self.addCleanup(m.stop)
-        setattr(self, attr, p)
-
-
-class TestBlockMetaSimple(BlockMetaTestBase):
+from .helpers import CiTestCase
+
+
+class TestBlockMetaSimple(CiTestCase):
     def setUp(self):
         super(TestBlockMetaSimple, self).setUp()
         self.target = "my_target"
@@ -120,10 +107,10 @@
             [call(['mount', devname, self.target])])
 
 
-class TestBlockMeta(BlockMetaTestBase):
+class TestBlockMeta(CiTestCase):
+
     def setUp(self):
         super(TestBlockMeta, self).setUp()
-        # self.target = tempfile.mkdtemp()
 
         basepath = 'curtin.commands.block_meta.'
         self.add_patch(basepath + 'get_path_to_storage_volume', 'mock_getpath')

=== modified file 'tests/unittests/test_commands_install.py'
--- tests/unittests/test_commands_install.py	2017-07-21 20:57:06 +0000
+++ tests/unittests/test_commands_install.py	2017-08-03 19:32:06 +0000
@@ -1,10 +1,10 @@
-from unittest import TestCase
 import copy
 
 from curtin.commands import install
-
-
-class TestMigrateProxy(TestCase):
+from .helpers import CiTestCase
+
+
+class TestMigrateProxy(CiTestCase):
     def test_legacy_moved_over(self):
         """Legacy setting should get moved over."""
         proxy = "http://my.proxy:3128"

=== modified file 'tests/unittests/test_config.py'
--- tests/unittests/test_config.py	2015-09-02 17:17:45 +0000
+++ tests/unittests/test_config.py	2017-08-03 19:32:06 +0000
@@ -1,12 +1,12 @@
-from unittest import TestCase
 import copy
 import json
 import textwrap
 
 from curtin import config
-
-
-class TestMerge(TestCase):
+from .helpers import CiTestCase
+
+
+class TestMerge(CiTestCase):
     def test_merge_cfg_string(self):
         d1 = {'str1': 'str_one'}
         d2 = {'dict1': {'d1.e1': 'd1-e1'}}
@@ -16,7 +16,7 @@
         self.assertEqual(d1, expected)
 
 
-class TestCmdArg2Cfg(TestCase):
+class TestCmdArg2Cfg(CiTestCase):
     def test_cmdarg_flat(self):
         self.assertEqual(config.cmdarg2cfg("foo=bar"), {'foo': 'bar'})
 
@@ -50,7 +50,7 @@
         self.assertEqual(via_merge, via_merge_cmdarg)
 
 
-class TestConfigArchive(TestCase):
+class TestConfigArchive(CiTestCase):
     def test_archive_dict(self):
         myarchive = _replace_consts(textwrap.dedent("""
             _ARCH_HEAD_

=== modified file 'tests/unittests/test_curthooks.py'
--- tests/unittests/test_curthooks.py	2017-07-28 19:01:38 +0000
+++ tests/unittests/test_curthooks.py	2017-08-03 19:32:06 +0000
@@ -1,29 +1,14 @@
 import os
-from unittest import TestCase
 from mock import call, patch, MagicMock
-import shutil
-import tempfile
 
 from curtin.commands import curthooks
 from curtin import util
 from curtin import config
 from curtin.reporter import events
-
-
-class CurthooksBase(TestCase):
-    def setUp(self):
-        super(CurthooksBase, self).setUp()
-
-    def add_patch(self, target, attr, autospec=True):
-        """Patches specified target object and sets it as attr on test
-        instance also schedules cleanup"""
-        m = patch(target, autospec=autospec)
-        p = m.start()
-        self.addCleanup(m.stop)
-        setattr(self, attr, p)
-
-
-class TestGetFlashKernelPkgs(CurthooksBase):
+from .helpers import CiTestCase
+
+
+class TestGetFlashKernelPkgs(CiTestCase):
     def setUp(self):
         super(TestGetFlashKernelPkgs, self).setUp()
         self.add_patch('curtin.util.subp', 'mock_subp')
@@ -57,7 +42,7 @@
         self.mock_is_uefi_bootable.assert_called_once_with()
 
 
-class TestCurthooksInstallKernel(CurthooksBase):
+class TestCurthooksInstallKernel(CiTestCase):
     def setUp(self):
         super(TestCurthooksInstallKernel, self).setUp()
         self.add_patch('curtin.util.has_pkg_available', 'mock_haspkg')
@@ -70,7 +55,7 @@
                                       'fallback-package': 'mock-fallback',
                                       'mapping': {}}}
         # Tests don't actually install anything so we just need a name
-        self.target = tempfile.mktemp()
+        self.target = self.tmp_dir()
 
     def test__installs_flash_kernel_packages_when_needed(self):
         kernel_package = self.kernel_cfg.get('kernel', {}).get('package', {})
@@ -94,14 +79,11 @@
             [kernel_package], target=self.target)
 
 
-class TestUpdateInitramfs(CurthooksBase):
+class TestUpdateInitramfs(CiTestCase):
     def setUp(self):
         super(TestUpdateInitramfs, self).setUp()
         self.add_patch('curtin.util.subp', 'mock_subp')
-        self.target = tempfile.mkdtemp()
-
-    def tearDown(self):
-        shutil.rmtree(self.target)
+        self.target = self.tmp_dir()
 
     def _mnt_call(self, point):
         target = os.path.join(self.target, point)
@@ -134,7 +116,7 @@
         self.mock_subp.assert_has_calls(subp_calls)
 
 
-class TestInstallMissingPkgs(CurthooksBase):
+class TestInstallMissingPkgs(CiTestCase):
     def setUp(self):
         super(TestInstallMissingPkgs, self).setUp()
         self.add_patch('platform.machine', 'mock_machine')
@@ -176,11 +158,11 @@
         self.assertEqual([], self.mock_install_packages.call_args_list)
 
 
-class TestSetupZipl(CurthooksBase):
+class TestSetupZipl(CiTestCase):
 
     def setUp(self):
         super(TestSetupZipl, self).setUp()
-        self.target = tempfile.mkdtemp()
+        self.target = self.tmp_dir()
 
     @patch('curtin.block.get_devices_for_mp')
     @patch('platform.machine')
@@ -203,11 +185,11 @@
             content)
 
 
-class TestSetupGrub(CurthooksBase):
+class TestSetupGrub(CiTestCase):
 
     def setUp(self):
         super(TestSetupGrub, self).setUp()
-        self.target = tempfile.mkdtemp()
+        self.target = self.tmp_dir()
         self.add_patch('curtin.util.lsb_release', 'mock_lsb_release')
         self.mock_lsb_release.return_value = {
             'codename': 'xenial',
@@ -230,9 +212,6 @@
         self.mock_in_chroot_subp.side_effect = iter(self.in_chroot_subp_output)
         self.mock_chroot.return_value = self.mock_in_chroot
 
-    def tearDown(self):
-        shutil.rmtree(self.target)
-
     def test_uses_old_grub_install_devices_in_cfg(self):
         cfg = {
             'grub_install_devices': ['/dev/vdb']
@@ -461,17 +440,13 @@
             self.mock_in_chroot_subp.call_args_list[0][0])
 
 
-class TestUbuntuCoreHooks(CurthooksBase):
+class TestUbuntuCoreHooks(CiTestCase):
     def setUp(self):
         super(TestUbuntuCoreHooks, self).setUp()
         self.target = None
 
-    def tearDown(self):
-        if self.target:
-            shutil.rmtree(self.target)
-
     def test_target_is_ubuntu_core(self):
-        self.target = tempfile.mkdtemp()
+        self.target = self.tmp_dir()
         ubuntu_core_path = os.path.join(self.target, 'system-data',
                                         'var/lib/snapd')
         util.ensure_dir(ubuntu_core_path)
@@ -484,7 +459,7 @@
         self.assertFalse(is_core)
 
     def test_target_is_ubuntu_core_noncore_target(self):
-        self.target = tempfile.mkdtemp()
+        self.target = self.tmp_dir()
         non_core_path = os.path.join(self.target, 'curtin')
         util.ensure_dir(non_core_path)
         self.assertTrue(os.path.isdir(non_core_path))
@@ -496,7 +471,7 @@
     @patch('curtin.commands.curthooks.handle_cloudconfig')
     def test_curthooks_no_config(self, mock_handle_cc, mock_del_file,
                                  mock_write_file):
-        self.target = tempfile.mkdtemp()
+        self.target = self.tmp_dir()
         cfg = {}
         curthooks.ubuntu_core_curthooks(cfg, target=self.target)
         self.assertEqual(len(mock_handle_cc.call_args_list), 0)
@@ -505,7 +480,7 @@
 
     @patch('curtin.commands.curthooks.handle_cloudconfig')
     def test_curthooks_cloud_config_remove_disabled(self, mock_handle_cc):
-        self.target = tempfile.mkdtemp()
+        self.target = self.tmp_dir()
         uc_cloud = os.path.join(self.target, 'system-data', 'etc/cloud')
         cc_disabled = os.path.join(uc_cloud, 'cloud-init.disabled')
         cc_path = os.path.join(uc_cloud, 'cloud.cfg.d')
@@ -531,7 +506,7 @@
     @patch('curtin.commands.curthooks.handle_cloudconfig')
     def test_curthooks_cloud_config(self, mock_handle_cc, mock_del_file,
                                     mock_write_file):
-        self.target = tempfile.mkdtemp()
+        self.target = self.tmp_dir()
         cfg = {
             'cloudconfig': {
                 'file1': {
@@ -553,7 +528,7 @@
     @patch('curtin.commands.curthooks.handle_cloudconfig')
     def test_curthooks_net_config(self, mock_handle_cc, mock_del_file,
                                   mock_write_file):
-        self.target = tempfile.mkdtemp()
+        self.target = self.tmp_dir()
         cfg = {
             'network': {
                 'version': '1',
@@ -603,7 +578,7 @@
             curthooks.handle_cloudconfig([], base_dir="foobar")
 
 
-class TestDetectRequiredPackages(TestCase):
+class TestDetectRequiredPackages(CiTestCase):
     test_config = {
         'storage': {
             1: {

=== modified file 'tests/unittests/test_feature.py'
--- tests/unittests/test_feature.py	2017-07-28 19:22:14 +0000
+++ tests/unittests/test_feature.py	2017-08-03 19:32:06 +0000
@@ -1,9 +1,9 @@
-from unittest import TestCase
+from .helpers import CiTestCase
 
 import curtin
 
 
-class TestExportsFeatures(TestCase):
+class TestExportsFeatures(CiTestCase):
     def test_has_storage_v1(self):
         self.assertIn('STORAGE_CONFIG_V1', curtin.FEATURES)
 

=== modified file 'tests/unittests/test_gpg.py'
--- tests/unittests/test_gpg.py	2017-02-03 16:02:29 +0000
+++ tests/unittests/test_gpg.py	2017-08-03 19:32:06 +0000
@@ -1,12 +1,12 @@
-from unittest import TestCase
 from mock import call, patch
 import textwrap
 
 from curtin import gpg
 from curtin import util
-
-
-class TestCurtinGpg(TestCase):
+from .helpers import CiTestCase
+
+
+class TestCurtinGpg(CiTestCase):
 
     @patch('curtin.util.subp')
     def test_export_armour(self, mock_subp):

=== modified file 'tests/unittests/test_make_dname.py'
--- tests/unittests/test_make_dname.py	2016-07-13 17:07:11 +0000
+++ tests/unittests/test_make_dname.py	2017-08-03 19:32:06 +0000
@@ -1,13 +1,13 @@
-from unittest import TestCase
 import mock
 
 import textwrap
 import uuid
 
 from curtin.commands import block_meta
-
-
-class TestMakeDname(TestCase):
+from .helpers import CiTestCase
+
+
+class TestMakeDname(CiTestCase):
     state = {'scratch': '/tmp/null'}
     rules_d = '/tmp/null/rules.d'
     rule_file = '/tmp/null/rules.d/{}.rules'

=== modified file 'tests/unittests/test_net.py'
--- tests/unittests/test_net.py	2017-07-19 21:54:01 +0000
+++ tests/unittests/test_net.py	2017-08-03 19:32:06 +0000
@@ -1,16 +1,14 @@
-from unittest import TestCase
 import mock
 import os
-import shutil
-import tempfile
 import yaml
 
 from curtin import config, net, util
 import curtin.net.network_state as network_state
+from .helpers import CiTestCase
 from textwrap import dedent
 
 
-class TestNetParserData(TestCase):
+class TestNetParserData(CiTestCase):
 
     def test_parse_deb_config_data_ignores_comments(self):
         contents = dedent("""\
@@ -235,13 +233,11 @@
             }, ifaces)
 
 
-class TestNetParser(TestCase):
+class TestNetParser(CiTestCase):
 
     def setUp(self):
-        self.target = tempfile.mkdtemp()
-
-    def tearDown(self):
-        shutil.rmtree(self.target)
+        super(TestNetParser, self).setUp()
+        self.target = self.tmp_dir()
 
     def make_config(self, path=None, name=None, contents=None,
                     parse=True):
@@ -387,9 +383,10 @@
         self.assertEqual({}, observed)
 
 
-class TestNetConfig(TestCase):
+class TestNetConfig(CiTestCase):
     def setUp(self):
-        self.target = tempfile.mkdtemp()
+        super(TestNetConfig, self).setUp()
+        self.target = self.tmp_dir()
         self.config_f = os.path.join(self.target, 'config')
         self.config = '''
 # YAML example of a simple network config
@@ -436,9 +433,6 @@
         ns.parse_config()
         return ns
 
-    def tearDown(self):
-        shutil.rmtree(self.target)
-
     def test_parse_net_config_data(self):
         ns = self.get_net_state()
         net_state_from_cls = ns.network_state

=== modified file 'tests/unittests/test_partitioning.py'
--- tests/unittests/test_partitioning.py	2015-08-10 16:34:02 +0000
+++ tests/unittests/test_partitioning.py	2017-08-03 19:32:06 +0000
@@ -1,6 +1,7 @@
-import unittest
+from unittest import skip
 import mock
 import curtin.commands.block_meta
+from .helpers import CiTestCase
 
 from sys import version_info
 if version_info.major == 2:
@@ -11,8 +12,8 @@
 parted = None  # FIXME: remove these tests entirely. This is here for flake8
 
 
[e-mail]
-class TestBlock(unittest.TestCase):
+@skip
+class TestBlock(CiTestCase):
     storage_config = {
         "sda": {"id": "sda", "type": "disk", "ptable": "msdos",
                 "serial": "DISK_1", "grub_device": "True"},

=== modified file 'tests/unittests/test_public.py'
--- tests/unittests/test_public.py	2017-07-28 20:54:10 +0000
+++ tests/unittests/test_public.py	2017-08-03 19:32:06 +0000
@@ -1,4 +1,3 @@
-from unittest import TestCase
 
 from curtin import block
 from curtin import config
@@ -6,9 +5,10 @@
 from curtin import util
 
 from curtin.commands import curthooks
-
-
-class TestPublicAPI(TestCase):
+from .helpers import CiTestCase
+
+
+class TestPublicAPI(CiTestCase):
     """Test entry points known to be used externally.
 
     Curtin's only known external library user is the curthooks

=== modified file 'tests/unittests/test_reporter.py'
--- tests/unittests/test_reporter.py	2016-06-22 15:27:45 +0000
+++ tests/unittests/test_reporter.py	2017-08-03 19:32:06 +0000
@@ -21,7 +21,6 @@
     unicode_literals,
     )
 
-from unittest import TestCase
 from mock import patch
 
 from curtin.reporter.legacy import (
@@ -39,13 +38,12 @@
 from curtin.reporter import handlers
 from curtin import url_helper
 from curtin.reporter import events
+from .helpers import CiTestCase
 
-import os
-import tempfile
 import base64
 
 
-class TestLegacyReporter(TestCase):
+class TestLegacyReporter(CiTestCase):
 
     @patch('curtin.reporter.legacy.LOG')
     def test_load_reporter_logs_empty_cfg(self, mock_LOG):
@@ -72,7 +70,7 @@
         self.assertTrue(mock_LOG.error.called)
 
 
-class TestMAASReporter(TestCase):
+class TestMAASReporter(CiTestCase):
     def test_load_factory_raises_exception_wrong_options(self):
         options = {'wrong': 'wrong'}
         self.assertRaises(
@@ -86,7 +84,7 @@
         self.assertIsInstance(reporter, MAASReporter)
 
 
-class TestReporter(TestCase):
+class TestReporter(CiTestCase):
     config = {'element1': {'type': 'webhook', 'level': 'INFO',
                            'consumer_key': "ck_foo",
                            'consumer_secret': 'cs_foo',
@@ -175,39 +173,32 @@
     @patch('curtin.reporter.events.report_event')
     def test_report_finished_post_files(self, mock_report_event):
         test_data = b'abcdefg'
-        tmp = tempfile.mkstemp()
-        try:
-            with open(tmp[1], 'wb') as fp:
-                fp.write(test_data)
-            events.report_finish_event(self.ev_name, self.ev_desc,
-                                       post_files=[tmp[1]])
-            event = self._get_reported_event(mock_report_event)
-            files = event.as_dict().get('files')
-            self.assertTrue(len(files) == 1)
-            self.assertEqual(files[0].get('path'), tmp[1])
-            self.assertEqual(files[0].get('encoding'), 'base64')
-            self.assertEqual(files[0].get('content'),
-                             base64.b64encode(test_data).decode())
-        finally:
-            os.remove(tmp[1])
+        tmpfname = self.tmp_path('testfile')
+        with open(tmpfname, 'wb') as fp:
+            fp.write(test_data)
+        events.report_finish_event(self.ev_name, self.ev_desc,
+                                   post_files=[tmpfname])
+        event = self._get_reported_event(mock_report_event)
+        files = event.as_dict().get('files')
+        self.assertTrue(len(files) == 1)
+        self.assertEqual(files[0].get('path'), tmpfname)
+        self.assertEqual(files[0].get('encoding'), 'base64')
+        self.assertEqual(files[0].get('content'),
+                         base64.b64encode(test_data).decode())
 
     @patch('curtin.url_helper.OauthUrlHelper')
     def test_webhook_handler_post_files(self, mock_url_helper):
         test_data = b'abcdefg'
-        tmp = tempfile.mkstemp()
-        tmpfname = tmp[1]
-        try:
-            with open(tmpfname, 'wb') as fp:
-                fp.write(test_data)
-            event = events.FinishReportingEvent('test_event_name',
-                                                'test event description',
-                                                post_files=[tmpfname],
-                                                level='INFO')
-            webhook_handler = handlers.WebHookHandler('127.0.0.1:8000',
-                                                      level='INFO')
-            webhook_handler.publish_event(event)
-            webhook_handler.oauth_helper.geturl.assert_called_with(
-                url='127.0.0.1:8000', data=event.as_dict(),
-                headers=webhook_handler.headers, retries=None)
-        finally:
-            os.remove(tmpfname)
+        tmpfname = self.tmp_path('testfile')
+        with open(tmpfname, 'wb') as fp:
+            fp.write(test_data)
+        event = events.FinishReportingEvent('test_event_name',
+                                            'test event description',
+                                            post_files=[tmpfname],
+                                            level='INFO')
+        webhook_handler = handlers.WebHookHandler('127.0.0.1:8000',
+                                                  level='INFO')
+        webhook_handler.publish_event(event)
+        webhook_handler.oauth_helper.geturl.assert_called_with(
+            url='127.0.0.1:8000', data=event.as_dict(),
+            headers=webhook_handler.headers, retries=None)

=== modified file 'tests/unittests/test_util.py'
--- tests/unittests/test_util.py	2017-06-09 20:54:25 +0000
+++ tests/unittests/test_util.py	2017-08-03 19:32:06 +0000
@@ -1,16 +1,14 @@
-from unittest import TestCase, skipIf
+from unittest import skipIf
 import mock
 import os
 import stat
-import shutil
-import tempfile
 from textwrap import dedent
 
 from curtin import util
-from .helpers import simple_mocked_open
-
-
-class TestLogTimer(TestCase):
+from .helpers import CiTestCase, simple_mocked_open
+
+
+class TestLogTimer(CiTestCase):
     def test_logger_called(self):
         data = {}
 
@@ -24,16 +22,14 @@
         self.assertIn("mymessage", data['msg'])
 
 
-class TestDisableDaemons(TestCase):
+class TestDisableDaemons(CiTestCase):
     prcpath = "usr/sbin/policy-rc.d"
 
     def setUp(self):
-        self.target = tempfile.mkdtemp()
+        super(TestDisableDaemons, self).setUp()
+        self.target = self.tmp_dir()
         self.temp_prc = os.path.join(self.target, self.prcpath)
 
-    def tearDown(self):
-        shutil.rmtree(self.target)
-
     def test_disable_daemons_in_root_works(self):
         ret = util.disable_daemons_in_root(self.target)
         self.assertTrue(ret)
@@ -55,8 +51,10 @@
         self.assertTrue(os.path.exists(self.temp_prc))
 
 
-class TestWhich(TestCase):
+class TestWhich(CiTestCase):
+
     def setUp(self):
+        super(TestWhich, self).setUp()
         self.orig_is_exe = util.is_exe
         util.is_exe = self.my_is_exe
         self.orig_path = os.environ.get("PATH")
@@ -103,8 +101,10 @@
         self.assertEqual(found, "/usr/bin2/fuzz")
 
 
-class TestLsbRelease(TestCase):
+class TestLsbRelease(CiTestCase):
+
     def setUp(self):
+        super(TestLsbRelease, self).setUp()
         self._reset_cache()
 
     def _reset_cache(self):
@@ -143,7 +143,7 @@
         self.assertEqual(util.lsb_release(), expected)
 
 
-class TestSubp(TestCase):
+class TestSubp(CiTestCase):
 
     stdin2err = ['bash', '-c', 'cat >&2']
     stdin2out = ['cat']
@@ -162,10 +162,9 @@
 
     def setUp(self):
         super(TestSubp, self).setUp()
-        mock_getunsh = mock.patch(
-            "curtin.util._get_unshare_pid_args", return_value=[])
-        self.mock_get_unshare_pid_args = mock_getunsh.start()
-        self.addCleanup(mock_getunsh.stop)
+        self.add_patch(
+            'curtin.util._get_unshare_pid_args', 'mock_get_unshare_pid_args',
+            return_value=[])
 
     def printf_cmd(self, *args):
         # bash's printf supports \xaa.  So does /usr/bin/printf
@@ -382,19 +381,17 @@
         self.assertEqual(expected, args[0])
 
 
-class TestGetUnsharePidArgs(TestCase):
+class TestGetUnsharePidArgs(CiTestCase):
     """Test the internal implementation for when to unshare."""
 
     def setUp(self):
         super(TestGetUnsharePidArgs, self).setUp()
-        mock_hasunsh = mock.patch(
-            "curtin.util._has_unshare_pid", return_value=True)
-        self.mock_has_unshare_pid = mock_hasunsh.start()
-        self.addCleanup(mock_hasunsh.stop)
-        mock_geteuid = mock.patch(
-            "curtin.util.os.geteuid", return_value=0)
-        self.mock_geteuid = mock_geteuid.start()
-        self.addCleanup(mock_geteuid.stop)
+        self.add_patch('curtin.util._has_unshare_pid', 'mock_has_unshare_pid',
+                       return_value=True)
+        # our trusty tox environment with mock 1.0.1 will stack trace
+        # if autospec is not disabled here.
+        self.add_patch('curtin.util.os.geteuid', 'mock_geteuid',
+                       autospec=False, return_value=0)
 
     def assertOff(self, result):
         self.assertEqual([], result)
@@ -455,7 +452,7 @@
         self.assertOff(util._get_unshare_pid_args("", "/target", 0))
 
 
-class TestHuman2Bytes(TestCase):
+class TestHuman2Bytes(CiTestCase):
     GB = 1024 * 1024 * 1024
     MB = 1024 * 1024
 
@@ -509,52 +506,42 @@
                 util.bytes2human(util.human2bytes(size_str)), size_str)
 
 
-class TestSetUnExecutable(TestCase):
+class TestSetUnExecutable(CiTestCase):
     tmpf = None
     tmpd = None
 
-    def tearDown(self):
-        if self.tmpf:
-            if os.path.exists(self.tmpf):
-                os.unlink(self.tmpf)
-            self.tmpf = None
-        if self.tmpd:
-            shutil.rmtree(self.tmpd)
-            self.tmpd = None
-
-    def tempfile(self, data=None):
-        fp, self.tmpf = tempfile.mkstemp()
-        if data:
-            fp.write(data)
-        os.close(fp)
-        return self.tmpf
+    def setUp(self):
+        super(CiTestCase, self).setUp()
+        self.tmpd = self.tmp_dir()
 
     def test_change_needed_returns_original_mode(self):
-        tmpf = self.tempfile()
+        tmpf = self.tmp_path('testfile')
+        util.write_file(tmpf, '')
         os.chmod(tmpf, 0o755)
         ret = util.set_unexecutable(tmpf)
         self.assertEqual(ret, 0o0755)
 
     def test_no_change_needed_returns_none(self):
-        tmpf = self.tempfile()
+        tmpf = self.tmp_path('testfile')
+        util.write_file(tmpf, '')
         os.chmod(tmpf, 0o600)
         ret = util.set_unexecutable(tmpf)
         self.assertEqual(ret, None)
 
     def test_change_does_as_expected(self):
-        tmpf = self.tempfile()
+        tmpf = self.tmp_path('testfile')
+        util.write_file(tmpf, '')
         os.chmod(tmpf, 0o755)
         ret = util.set_unexecutable(tmpf)
         self.assertEqual(ret, 0o0755)
         self.assertEqual(stat.S_IMODE(os.stat(tmpf).st_mode), 0o0644)
 
     def test_strict_no_exists_raises_exception(self):
-        self.tmpd = tempfile.mkdtemp()
         bogus = os.path.join(self.tmpd, 'bogus')
         self.assertRaises(ValueError, util.set_unexecutable, bogus, True)
 
 
-class TestTargetPath(TestCase):
+class TestTargetPath(CiTestCase):
     def test_target_empty_string(self):
         self.assertEqual("/etc/passwd", util.target_path("", "/etc/passwd"))
 
@@ -596,7 +583,7 @@
                          util.target_path("/target/", "///my/path/"))
 
 
-class TestRunInChroot(TestCase):
+class TestRunInChroot(CiTestCase):
     """Test the legacy 'RunInChroot'.
 
     The test works by mocking ChrootableTarget's __enter__ to do nothing.
@@ -626,7 +613,7 @@
         m_subp.assert_called_with(cmd, target=target)
 
 
-class TestLoadFile(TestCase):
+class TestLoadFile(CiTestCase):
     """Test utility 'load_file'"""
 
     def test_load_file_simple(self):
@@ -657,7 +644,7 @@
             self.assertEqual(loaded_contents, contents)
 
 
-class TestIpAddress(TestCase):
+class TestIpAddress(CiTestCase):
     """Test utility 'is_valid_ip{,v4,v6}_address'"""
 
     def test_is_valid_ipv6_address(self):
@@ -682,10 +669,11 @@
             '2002:4559:1FE2:0000:0000:0000:4559:1FE2'))
 
 
-class TestLoadCommandEnvironment(TestCase):
+class TestLoadCommandEnvironment(CiTestCase):
+
     def setUp(self):
-        self.tmpd = tempfile.mkdtemp()
-        self.addCleanup(shutil.rmtree, self.tmpd)
+        super(TestLoadCommandEnvironment, self).setUp()
+        self.tmpd = self.tmp_dir()
         all_names = {
             'CONFIG',
             'OUTPUT_FSTAB',
@@ -728,7 +716,7 @@
             self.fail("unexpected key error raised: %s" % e)
 
 
-class TestWaitForRemoval(TestCase):
+class TestWaitForRemoval(CiTestCase):
     def test_wait_for_removal_missing_path(self):
         with self.assertRaises(ValueError):
             util.wait_for_removal(None)
@@ -796,14 +784,12 @@
         ])
 
 
-class TestGetEFIBootMGR(TestCase):
+class TestGetEFIBootMGR(CiTestCase):
 
     def setUp(self):
         super(TestGetEFIBootMGR, self).setUp()
-        mock_chroot = mock.patch(
-            'curtin.util.ChrootableTarget', autospec=False)
-        self.mock_chroot = mock_chroot.start()
-        self.addCleanup(mock_chroot.stop)
+        self.add_patch(
+            'curtin.util.ChrootableTarget', 'mock_chroot', autospec=False)
         self.mock_in_chroot = mock.MagicMock()
         self.mock_in_chroot.__enter__.return_value = self.mock_in_chroot
         self.in_chroot_subp_output = []

=== modified file 'tests/unittests/test_version.py'
--- tests/unittests/test_version.py	2017-02-06 22:49:33 +0000
+++ tests/unittests/test_version.py	2017-08-03 19:32:06 +0000
@@ -1,28 +1,16 @@
-from unittest import TestCase
 import mock
 import subprocess
 import os
 
 from curtin import version
 from curtin import __version__ as old_version
-
-
-class CurtinVersionBase(TestCase):
-    def setUp(self):
-        super(CurtinVersionBase, self).setUp()
-
-    def add_patch(self, target, attr):
-        """Patches specified target object and sets it as attr on test
-        instance also schedules cleanup"""
-        m = mock.patch(target, autospec=True)
-        p = m.start()
-        self.addCleanup(m.stop)
-        setattr(self, attr, p)
-
-
-class TestCurtinVersion(CurtinVersionBase):
-
-    def setUp(self):
+from .helpers import CiTestCase
+
+
+class TestCurtinVersion(CiTestCase):
+
+    def setUp(self):
+        super(TestCurtinVersion, self).setUp()
         self.add_patch('subprocess.check_output', 'mock_subp')
         self.add_patch('os.path', 'mock_path')