Merge ~dbungert/curtin:py35-fixes into curtin:release/23.1

[Dan Bungert]

Several fixes for compatibility with python 3.5

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

FAILED: Continuous integration, rev:bd088e4abb11c676c5a8b0fa8fb18b00d7e64062
https://jenkins.canonical.com/server-team/job/curtin-ci/126/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/server-team/job/curtin-ci/nodes=metal-amd64/126/
    FAILURE: https://jenkins.canonical.com/server-team/job/curtin-ci/nodes=metal-arm64/126/
    FAILURE: https://jenkins.canonical.com/server-team/job/curtin-ci/nodes=metal-ppc64el/126/
    FAILURE: https://jenkins.canonical.com/server-team/job/curtin-ci/nodes=metal-s390x/126/

Click here to trigger a rebuild:
https://jenkins.canonical.com/server-team/job/curtin-ci/126//rebuild

review: Needs Fixing (continuous-integration)

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

FAILED: Continuous integration, rev:17f2a1c6bec082ff717fd10ddfdb62a39121d240
https://jenkins.canonical.com/server-team/job/curtin-ci/127/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/server-team/job/curtin-ci/nodes=metal-amd64/127/
    FAILURE: https://jenkins.canonical.com/server-team/job/curtin-ci/nodes=metal-arm64/127/
    FAILURE: https://jenkins.canonical.com/server-team/job/curtin-ci/nodes=metal-ppc64el/127/
    FAILURE: https://jenkins.canonical.com/server-team/job/curtin-ci/nodes=metal-s390x/127/

Click here to trigger a rebuild:
https://jenkins.canonical.com/server-team/job/curtin-ci/127//rebuild

review: Needs Fixing (continuous-integration)

[Michael Hudson-Doyle (mwhudson)]

Thank you for keeping this stuff off master :-)

review: Approve

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

PASSED: Continuous integration, rev:6d27dc64d9a53694848d52e5c14b615453b6a388
https://jenkins.canonical.com/server-team/job/curtin-ci/129/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/server-team/job/curtin-ci/nodes=metal-amd64/129/
    SUCCESS: https://jenkins.canonical.com/server-team/job/curtin-ci/nodes=metal-arm64/129/
    SUCCESS: https://jenkins.canonical.com/server-team/job/curtin-ci/nodes=metal-ppc64el/129/
    SUCCESS: https://jenkins.canonical.com/server-team/job/curtin-ci/nodes=metal-s390x/129/

Click here to trigger a rebuild:
https://jenkins.canonical.com/server-team/job/curtin-ci/129//rebuild

review: Approve (continuous-integration)

diff --git a/curtin/commands/__init__.py b/curtin/commands/__init__.py
index 51b91c6..2d784db 100644
--- a/curtin/commands/__init__.py
+++ b/curtin/commands/__init__.py
@@ -1,5 +1,6 @@
 # This file is part of curtin. See LICENSE file for copyright and license info.
 
+
 class MutuallyExclusiveGroup:
     def __init__(self, entries) -> None:
         self.entries = entries
diff --git a/curtin/commands/block_meta_v2.py b/curtin/commands/block_meta_v2.py
index ca82522..0dfc812 100644
--- a/curtin/commands/block_meta_v2.py
+++ b/curtin/commands/block_meta_v2.py
@@ -1,10 +1,6 @@
 # This file is part of curtin. See LICENSE file for copyright and license info.
 
 import os
-from typing import (
-    List,
-    Optional,
-    )
 
 import attr
 
@@ -26,21 +22,21 @@ from curtin.storage_config import (
 from curtin.udev import udevadm_settle
 
 
-@attr.s(auto_attribs=True)
+@attr.s()
 class PartTableEntry:
     # The order listed here matches the order sfdisk represents these fields
     # when using the --dump argument.
-    number: int
-    start: int
-    size: int
-    type: str
-    uuid: Optional[str]
+    number = attr.ib(default=None)
+    start = attr.ib(default=None)
+    size = attr.ib(default=None)
+    type = attr.ib(default=None)
+    uuid = attr.ib(default=None)
     # name here is the sfdisk term - quoted descriptive text of the partition -
     # not to be confused with what make_dname() does.
     # Offered in the partition command as 'partition_name'.
-    name: Optional[str]
-    attrs: Optional[List[str]]
-    bootable: bool = False
+    name = attr.ib(default=None)
+    attrs = attr.ib(default=None)
+    bootable = attr.ib(default=False)
 
     def render(self):
         r = '{}: '.format(self.number)
@@ -128,8 +124,8 @@ class SFDiskPartTable:
         self._sector_bytes = sector_bytes
         if ONE_MIB_BYTES % sector_bytes != 0:
             raise Exception(
-                f"sector_bytes {sector_bytes} does not divide 1MiB, cannot "
-                "continue!")
+                "sector_bytes {} does not divide 1MiB, cannot "
+                "continue!".format(sector_bytes))
         self.one_mib_sectors = ONE_MIB_BYTES // sector_bytes
 
     def bytes2sectors(self, amount):
diff --git a/curtin/commands/install.py b/curtin/commands/install.py
index 7ccad87..bd1016a 100644
--- a/curtin/commands/install.py
+++ b/curtin/commands/install.py
@@ -112,16 +112,16 @@ def writeline(fname, output):
         pass
 
 
-@attr.s(auto_attribs=True)
+@attr.s()
 class WorkingDir:
-    target: str
-    top: str
-    scratch: str
-    interfaces: str
-    netconf: str
-    netstate: str
-    fstab: str
-    config_file: str
+    target = attr.ib()
+    top = attr.ib()
+    scratch = attr.ib()
+    interfaces = attr.ib()
+    netconf = attr.ib()
+    netstate = attr.ib()
+    fstab = attr.ib()
+    config_file = attr.ib()
 
     @classmethod
     def import_existing(cls, config):
diff --git a/tests/integration/test_block_meta.py b/tests/integration/test_block_meta.py
index 87f8802..d7628b5 100644
--- a/tests/integration/test_block_meta.py
+++ b/tests/integration/test_block_meta.py
@@ -1,17 +1,15 @@
 # This file is part of curtin. See LICENSE file for copyright and license info.
 
-import dataclasses
-from dataclasses import dataclass
 import contextlib
 import json
 import os
-from parameterized import parameterized
 import re
 import sys
-from typing import Optional
 from unittest import skipIf
 import yaml
 
+import attr
+
 from curtin import block, compat, distro, log, udev, util
 from curtin.commands.block_meta import _get_volume_fstype
 from curtin.commands.block_meta_v2 import ONE_MIB_BYTES
@@ -38,22 +36,25 @@ def loop_dev(image, sector_size=512):
         util.subp(['losetup', '--detach', dev])
 
 
-@dataclass(order=True)
+@attr.s(init=True, cmp=False)
 class PartData:
-    number: Optional[int] = None
-    offset: Optional[int] = None
-    size: Optional[int] = None
-    boot: Optional[bool] = None
-    partition_type: Optional[str] = None
+    number = attr.ib(default=None)
+    offset = attr.ib(default=None)
+    size = attr.ib(default=None)
+    boot = attr.ib(default=None)
+    partition_type = attr.ib(default=None)
 
     # test cases may initialize the values they care about
     # test utilities shall initialize all fields
     def assertFieldsAreNotNone(self):
-        for field in dataclasses.fields(self):
+        for field in attr.fields(self.__class__):
             assert getattr(self, field.name) is not None
 
+    def __lt__(self, other):
+        return self.number < other.number
+
     def __eq__(self, other):
-        for field in dataclasses.fields(self):
+        for field in attr.fields(self.__class__):
             myval = getattr(self, field.name)
             otherval = getattr(other, field.name)
             if myval is not None and otherval is not None \
@@ -64,7 +65,7 @@ class PartData:
 
 def _get_ext_size(dev, part_action):
     num = part_action['number']
-    cmd = ['dumpe2fs', '-h', f'{dev}p{num}']
+    cmd = ['dumpe2fs', '-h', '{}p{}'.format(dev, num)]
     out = util.subp(cmd, capture=True)[0]
     for line in out.splitlines():
         if line.startswith('Block count'):
@@ -79,7 +80,7 @@ def _get_ntfs_size(dev, part_action):
     cmd = ['ntfsresize',
            '--no-action',
            '--force',  # needed post-resize, which otherwise demands a CHKDSK
-           '--info', f'{dev}p{num}']
+           '--info', '{}p{}'.format(dev, num)]
     out = util.subp(cmd, capture=True)[0]
     # Sample input:
     # Current volume size: 41939456 bytes (42 MB)
@@ -101,7 +102,7 @@ _get_fs_sizers = {
 
 def _get_filesystem_size(dev, part_action, fstype='ext4'):
     if fstype not in _get_fs_sizers.keys():
-        raise Exception(f'_get_filesystem_size: no support for {fstype}')
+        raise Exception('_get_filesystem_size: no support for %s' % fstype)
     return _get_fs_sizers[fstype](dev, part_action)
 
 
@@ -124,7 +125,7 @@ def summarize_partitions(dev):
         (unused, s_number, s_offset, s_size) = [
                 entry for entry in sysfs_data
                 if '/dev/' + entry[0] == node][0]
-        assert node.startswith(f'{dev}p')
+        assert node.startswith(dev + 'p')
         number = int(node[len(dev) + 1:])
         ptype = part['type']
         offset = part['start'] * sectorsize
@@ -206,13 +207,13 @@ class TestBlockMeta(IntegrationTestCase):
     def mount(self, dev, partition_cfg):
         mnt_point = self.tmp_dir()
         num = partition_cfg['number']
-        with util.mount(f'{dev}p{num}', mnt_point):
+        with util.mount('{}p{}'.format(dev, num), mnt_point):
             yield mnt_point
 
     @contextlib.contextmanager
     def open_file_on_part(self, dev, part_action, mode):
         with self.mount(dev, part_action) as mnt_point:
-            with open(f'{mnt_point}/data.txt', mode) as fp:
+            with open(mnt_point + '/data.txt', mode) as fp:
                 yield fp
 
     def create_data(self, dev, part_action):
@@ -232,7 +233,7 @@ class TestBlockMeta(IntegrationTestCase):
             tolerance = 512 * 10
         actual_fssize = _get_filesystem_size(dev, part_action, fstype)
         diff = expected - actual_fssize
-        self.assertTrue(0 <= diff <= tolerance, f'difference of {diff}')
+        self.assertTrue(0 <= diff <= tolerance, 'difference of ' + str(diff))
 
     def run_bm(self, config, *args, **kwargs):
         config_path = self.tmp_path('config.yaml')
@@ -602,7 +603,7 @@ class TestBlockMeta(IntegrationTestCase):
             }
             with loop_dev(img) as dev:
                 try:
-                    self.run_bm(curtin_cfg, f'--devices={dev}', env=cmd_env)
+                    self.run_bm(curtin_cfg, '--devices=' + dev, env=cmd_env)
                 finally:
                     util.subp(['umount', mnt_point])
                     udev.udevadm_settle()
@@ -622,7 +623,7 @@ class TestBlockMeta(IntegrationTestCase):
                              fstype=fstype)
         self.run_bm(config.render())
         with loop_dev(img) as dev:
-            self.assertEqual(fstype, _get_volume_fstype(f'{dev}p1'))
+            self.assertEqual(fstype, _get_volume_fstype(dev + 'p1'))
             self.create_data(dev, p1)
             self.assertEqual(
                 summarize_partitions(dev), [
@@ -651,7 +652,7 @@ class TestBlockMeta(IntegrationTestCase):
             p1['size'] = size
             self.run_bm(config.render())
             with loop_dev(img) as dev:
-                self.assertEqual('ntfs', _get_volume_fstype(f'{dev}p1'))
+                self.assertEqual('ntfs', _get_volume_fstype(dev + 'p1'))
                 self.create_data(dev, p1)
                 self.assertEqual(
                     summarize_partitions(dev), [
@@ -959,11 +960,11 @@ class TestBlockMeta(IntegrationTestCase):
             with self.mount(dev, p1) as mnt_point:
                 # Attempt to create files across the partition with gaps
                 for i in range(1, 41):
-                    with open(f'{mnt_point}/{str(i)}', 'wb') as fp:
+                    with open('{}/{}'.format(mnt_point, i), 'wb') as fp:
                         fp.write(bytes([i]) * (2 << 20))
                 for i in range(1, 41):
                     if i % 5 != 0:
-                        os.remove(f'{mnt_point}/{str(i)}')
+                        os.remove('{}/{}'.format(mnt_point, i))
 
         config = StorageConfigBuilder(version=2)
         config.add_image(path=img, size='100M', ptable='gpt')
@@ -981,7 +982,7 @@ class TestBlockMeta(IntegrationTestCase):
                 ])
             with self.mount(dev, p1) as mnt_point:
                 for i in range(5, 41, 5):
-                    with open(f'{mnt_point}/{i}', 'rb') as fp:
+                    with open('{}/{}'.format(mnt_point, i), 'rb') as fp:
                         self.assertEqual(bytes([i]) * (2 << 20), fp.read())
 
     def test_parttype_dos(self):
@@ -1043,8 +1044,7 @@ class TestBlockMeta(IntegrationTestCase):
             PartData(number=4, offset=80 << 20, size=19 << 20,
                      partition_type=winre))
 
-    @parameterized.expand([('msdos',), ('gpt',)])
-    def test_disk_label_id_persistent(self, ptable):
+    def _test_disk_label_id_persistent(self, ptable):
         # when the disk is preserved, the disk label id shall also be preserved
         self.img = self.tmp_path('image.img')
         config = StorageConfigBuilder(version=2)
@@ -1063,6 +1063,12 @@ class TestBlockMeta(IntegrationTestCase):
         with loop_dev(self.img) as dev:
             self.assertEqual(orig_label_id, _get_disk_label_id(dev))
 
+    def test_disk_label_id_persistent_msdos(self):
+        self._test_disk_label_id_persistent('msdos')
+
+    def test_disk_label_id_persistent_gpt(self):
+        self._test_disk_label_id_persistent('gpt')
+
     def test_gpt_uuid_persistent(self):
         # A persistent partition with an unspecified uuid shall keep the uuid
         self.img = self.tmp_path('image.img')
@@ -1099,7 +1105,7 @@ class TestBlockMeta(IntegrationTestCase):
             actual_name = sfdisk_info['partitions'][0]['name']
         self.assertEqual(name, actual_name)
 
-    def test_gpt_name_persistent(self):
+    def _test_gpt_name_persistent(self, title, name):
         self.img = self.tmp_path('image.img')
         name = self.random_string()
         config = StorageConfigBuilder(version=2)
@@ -1123,6 +1129,9 @@ class TestBlockMeta(IntegrationTestCase):
             actual_name = sfdisk_info['partitions'][0]['name']
         self.assertEqual(name, actual_name)
 
+    def test_gpt_name_persistent_random(self):
+        self._test_gpt_name_persistent('random', CiTestCase.random_string())
+
     def test_gpt_set_single_attr(self):
         self.img = self.tmp_path('image.img')
         config = StorageConfigBuilder(version=2)
@@ -1267,8 +1276,7 @@ table-length: 256'''.encode()
         self.assertPartitions(
             PartData(number=1, offset=1 << 20, size=1 << 20))
 
-    @parameterized.expand(((1,), (2,)))
-    def test_swap(self, sv):
+    def _test_swap(self, sv):
         self.img = self.tmp_path('image.img')
         config = StorageConfigBuilder(version=sv)
         config.add_image(path=self.img, create=True, size='20M',
@@ -1279,3 +1287,9 @@ table-length: 256'''.encode()
         self.assertPartitions(
             PartData(number=1, offset=1 << 20, size=1 << 20, boot=False,
                      partition_type='82'))
+
+    def test_swap_sv1(self):
+        self._test_swap(1)
+
+    def test_swap_sv2(self):
+        self._test_swap(2)
diff --git a/tests/integration/webserv.py b/tests/integration/webserv.py
index f4ce4e4..de30e04 100644
--- a/tests/integration/webserv.py
+++ b/tests/integration/webserv.py
@@ -1,8 +1,10 @@
 # This file is part of curtin. See LICENSE file for copyright and license info.
 
-import threading
-import socketserver
 from http.server import SimpleHTTPRequestHandler
+import socketserver
+import threading
+import os
+
 from tests.vmtests.image_sync import IMAGE_DIR
 
 
@@ -12,7 +14,17 @@ class ThreadedTCPServer(socketserver.ThreadingMixIn, socketserver.TCPServer):
 
 class ImageHTTPRequestHandler(SimpleHTTPRequestHandler):
     def __init__(self, *args, **kwargs):
-        super().__init__(*args, directory=IMAGE_DIR, **kwargs)
+        try:
+            super().__init__(*args, directory=IMAGE_DIR, **kwargs)
+        except TypeError:
+            # SimpleHTTPRequestHandler in python < 3.7 doesn't take a directory
+            # arg, fake it.
+            curdir = os.getcwd()
+            os.chdir(IMAGE_DIR)
+            try:
+                super().__init__(*args, **kwargs)
+            finally:
+                os.chdir(curdir)
 
 
 class ImageServer:
@@ -50,4 +62,4 @@ class ImageServer:
         if self.server is not None:
             ip, port = self.server.server_address
 
-        return f"http://{ip}:{port}"
+        return "http://{}:{}".format(ip, port)
diff --git a/tests/unittests/test_commands_block_meta.py b/tests/unittests/test_commands_block_meta.py
index dc03359..25d92ab 100644
--- a/tests/unittests/test_commands_block_meta.py
+++ b/tests/unittests/test_commands_block_meta.py
@@ -3038,10 +3038,10 @@ label: gpt
         table = block_meta_v2.GPTPartTable(512)
         table.add(dict(number=1, offset=1 << 20, size=9 << 20,
                        flag='boot', partition_type=ptype))
-        expected = f'''\
+        expected = '''\
 label: gpt
 
-1:  start=2048 size=18432 type={ptype}'''
+1:  start=2048 size=18432 type={}'''.format(ptype)
         self.assertEqual(expected, table.render())
 
     def test_gpt_name(self):
@@ -3050,10 +3050,10 @@ label: gpt
         table.add(dict(number=1, offset=1 << 20, size=9 << 20, flag='boot',
                        partition_name=name))
         type_id = "C12A7328-F81F-11D2-BA4B-00A0C93EC93B"
-        expected = f'''\
+        expected = '''\
 label: gpt
 
-1:  start=2048 size=18432 type={type_id} name="{name}"'''
+1:  start=2048 size=18432 type={} name="{}"'''.format(type_id, name)
         self.assertEqual(expected, table.render())
 
     def test_gpt_name_spaces(self):
@@ -3062,10 +3062,10 @@ label: gpt
         table.add(dict(number=1, offset=1 << 20, size=9 << 20, flag='boot',
                        partition_name=name))
         type_id = "C12A7328-F81F-11D2-BA4B-00A0C93EC93B"
-        expected = f'''\
+        expected = '''\
 label: gpt
 
-1:  start=2048 size=18432 type={type_id} name="{name}"'''
+1:  start=2048 size=18432 type={} name="{}"'''.format(type_id, name)
         self.assertEqual(expected, table.render())
 
     def test_gpt_attrs_none(self):
@@ -3073,10 +3073,10 @@ label: gpt
         table.add(dict(number=1, offset=1 << 20, size=9 << 20, flag='boot',
                        attrs=None))
         type_id = "C12A7328-F81F-11D2-BA4B-00A0C93EC93B"
-        expected = f'''\
+        expected = '''\
 label: gpt
 
-1:  start=2048 size=18432 type={type_id}'''
+1:  start=2048 size=18432 type={}'''.format(type_id)
         self.assertEqual(expected, table.render())
 
     def test_gpt_attrs_empty(self):
@@ -3084,10 +3084,10 @@ label: gpt
         table.add(dict(number=1, offset=1 << 20, size=9 << 20, flag='boot',
                        attrs=[]))
         type_id = "C12A7328-F81F-11D2-BA4B-00A0C93EC93B"
-        expected = f'''\
+        expected = '''\
 label: gpt
 
-1:  start=2048 size=18432 type={type_id}'''
+1:  start=2048 size=18432 type={}'''.format(type_id)
         self.assertEqual(expected, table.render())
 
     def test_gpt_attrs_required(self):
@@ -3095,10 +3095,10 @@ label: gpt
         table.add(dict(number=1, offset=1 << 20, size=9 << 20, flag='boot',
                        attrs=['RequiredPartition']))
         type_id = "C12A7328-F81F-11D2-BA4B-00A0C93EC93B"
-        expected = f'''\
+        expected = '''\
 label: gpt
 
-1:  start=2048 size=18432 type={type_id} attrs="RequiredPartition"'''
+1:  start=2048 size=18432 type={} attrs="RequiredPartition"'''.format(type_id)
         self.assertEqual(expected, table.render())
 
     def test_gpt_attrs_bit(self):
@@ -3106,10 +3106,10 @@ label: gpt
         table.add(dict(number=1, offset=1 << 20, size=9 << 20, flag='boot',
                        attrs=['GUID:51']))
         type_id = "C12A7328-F81F-11D2-BA4B-00A0C93EC93B"
-        expected = f'''\
+        expected = '''\
 label: gpt
 
-1:  start=2048 size=18432 type={type_id} attrs="GUID:51"'''
+1:  start=2048 size=18432 type={} attrs="GUID:51"'''.format(type_id)
         self.assertEqual(expected, table.render())
 
     def test_gpt_attrs_multi(self):
@@ -3117,10 +3117,11 @@ label: gpt
         table.add(dict(number=1, offset=1 << 20, size=9 << 20, flag='boot',
                        attrs=['RequiredPartition', 'GUID:51']))
         type_id = "C12A7328-F81F-11D2-BA4B-00A0C93EC93B"
-        expected = f'''\
+        attrs = 'RequiredPartition GUID:51'
+        expected = '''\
 label: gpt
 
-1:  start=2048 size=18432 type={type_id} attrs="RequiredPartition GUID:51"'''
+1:  start=2048 size=18432 type={} attrs="{}"'''.format(type_id, attrs)
         self.assertEqual(expected, table.render())
 
     def test_dos_basic(self):
@@ -3144,10 +3145,10 @@ label: dos
         table = block_meta_v2.DOSPartTable(512)
         table.add(dict(number=1, offset=1 << 20, size=9 << 20,
                        flag='boot', partition_type=ptype))
-        expected = f'''\
+        expected = '''\
 label: dos
 
-1:  start=2048 size=18432 type={ptype} bootable'''
+1:  start=2048 size=18432 type={} bootable'''.format(ptype)
         self.assertEqual(expected, table.render())
 
     def test_preserve_labelid_gpt(self):
@@ -3243,20 +3244,20 @@ label: dos
                 number=1, start=2, size=3, type='04', bootable=True,
                 uuid=uuid, name='name',
                 attrs=['stuff', 'things'])
-        expected = f'1:  start=2 size=3 type=04 uuid={uuid} ' + \
+        expected = '1:  start=2 size=3 type=04 uuid={} '.format(uuid) + \
             'name="name" attrs="stuff things" bootable'
         self.assertEqual(expected, pte.render())
 
     def test_gpt_entry_preserve(self):
         uuid = str(random_uuid())
         name = self.random_string()
-        attrs = f'{self.random_string()} {self.random_string()}'
+        attrs = '{} {}'.format(self.random_string(), self.random_string())
         pte = block_meta_v2.PartTableEntry(
                 number=1, start=2, size=3, type='04', bootable=False,
                 uuid=None, name=None, attrs=None)
         pte.preserve({'uuid': uuid, 'name': name, 'attrs': attrs})
-        expected = f'1:  start=2 size=3 type=04 uuid={uuid} ' + \
-            f'name="{name}" attrs="{attrs}"'
+        expected = '1:  start=2 size=3 type=04 uuid={} '.format(uuid) + \
+            'name="{}" attrs="{}"'.format(name, attrs)
         self.assertEqual(expected, pte.render())
 
     def test_v2_dos_is_logical(self):
diff --git a/tests/unittests/test_curthooks.py b/tests/unittests/test_curthooks.py
index 9e4fa87..a96f5fd 100644
--- a/tests/unittests/test_curthooks.py
+++ b/tests/unittests/test_curthooks.py
@@ -2286,19 +2286,21 @@ class TestDoAptConfig(CiTestCase):
     def test_apt_config_dict(self):
         with patch(self.handle_apt_sym) as m_handle_apt:
             curthooks.do_apt_config({"apt": {}}, target="/")
-        m_handle_apt.assert_called()
+        m_handle_apt.assert_any_call({}, '/')
 
     def test_with_apt_config(self):
         with patch(self.handle_apt_sym) as m_handle_apt:
             curthooks.do_apt_config(
                     {"apt": {"proxy": {"http_proxy": "http://proxy:3128"}}},
                     target="/")
-        m_handle_apt.assert_called_once()
+        m_handle_apt.assert_any_call(
+                {'proxy': {'http_proxy': 'http://proxy:3128'}}, '/')
 
     def test_with_debconf_selections(self):
         # debconf_selections are translated to apt config
         with patch(self.handle_apt_sym) as m_handle_apt:
             curthooks.do_apt_config({"debconf_selections": "foo"}, target="/")
-        m_handle_apt.assert_called_once()
+        m_handle_apt.assert_any_call({'debconf_selections': 'foo'}, '/')
+
 
 # vi: ts=4 expandtab syntax=python
diff --git a/tests/unittests/test_distro.py b/tests/unittests/test_distro.py
index 5743475..516a422 100644
--- a/tests/unittests/test_distro.py
+++ b/tests/unittests/test_distro.py
@@ -311,7 +311,7 @@ class TestAptInstall(CiTestCase):
         ]
 
         distro.run_apt_command('install', ['foobar', 'wark'])
-        m_apt_update.assert_called_once()
+        self.assertEqual(1, m_apt_update.call_count)
         m_apt_install.assert_has_calls(expected_calls)
         m_subp.assert_called_once_with(['apt-get', 'clean'], target='/')
 
@@ -321,7 +321,7 @@ class TestAptInstall(CiTestCase):
 
         # no clean option
         distro.run_apt_command('install', ['foobar', 'wark'], clean=False)
-        m_apt_update.assert_called_once()
+        self.assertEqual(1, m_apt_update.call_count)
         m_subp.assert_has_calls(expected_calls[:-1])
 
     @mock.patch.object(util.ChrootableTarget, "__enter__", new=lambda a: a)
@@ -334,11 +334,11 @@ class TestAptInstall(CiTestCase):
         ]
 
         expected_calls = [
-            mock.call(cmd_prefix + ['install', '--download-only']
-                                 + ['foobar', 'wark'],
+            mock.call(cmd_prefix +
+                      ['install', '--download-only'] +
+                      ['foobar', 'wark'],
                       env=None, target='/', retries=None),
-            mock.call(cmd_prefix + ['install']
-                                 + ['foobar', 'wark'],
+            mock.call(cmd_prefix + ['install', 'foobar', 'wark'],
                       env=None, target='/'),
         ]
 
diff --git a/tests/unittests/test_storage_config.py b/tests/unittests/test_storage_config.py
index a538ece..adab329 100644
--- a/tests/unittests/test_storage_config.py
+++ b/tests/unittests/test_storage_config.py
@@ -1109,9 +1109,11 @@ class TestExtractStorageConfig(CiTestCase):
         config = extracted['storage']['config']
         disks = [cfg for cfg in config if cfg['type'] == 'disk']
         expected_count = len([
-            1 for bd_name, bd_data in self.probe_data['blockdev'].items()
-            if bd_data.get('DM_UUID', '').startswith('mpath-')
-            or bd_name.startswith('/dev/dasd') and bd_data['DEVTYPE'] == 'disk'
+            1
+            for bd_name, bd_data in self.probe_data['blockdev'].items()
+            if bd_data.get('DM_UUID', '').startswith('mpath-') or
+            bd_name.startswith('/dev/dasd') and
+            bd_data['DEVTYPE'] == 'disk'
             ])
         self.assertEqual(expected_count, len(disks))
 
@@ -1170,7 +1172,10 @@ class TestSelectConfigs(CiTestCase):
         id1 = {'a': 1, 'c': 3}
         sc = {'id0': id0, 'id1': id1}
 
-        self.assertEqual([id0, id1], select_configs(sc, a=1))
+        actual = select_configs(sc, a=1)
+        self.assertEqual(2, len(actual))
+        self.assertIn(id0, actual)
+        self.assertIn(id1, actual)
 
     def test_not_found(self):
         id0 = {'a': 1, 'b': 2}
diff --git a/tests/unittests/test_util.py b/tests/unittests/test_util.py
index 6a0c951..306e963 100644
--- a/tests/unittests/test_util.py
+++ b/tests/unittests/test_util.py
@@ -1179,7 +1179,7 @@ class TestNotExclusiveRetry(CiTestCase):
         f = mock.Mock(side_effect=[util.NotExclusiveError, 'success'])
 
         self.assertEqual(util.not_exclusive_retry(f, 1, 2, 3), 'success')
-        sleep.assert_called_once()
+        self.assertEqual(1, sleep.call_count)
 
     @mock.patch('curtin.util.time.sleep')
     def test_not_exclusive_retry_not_exclusive_twice(self, sleep):
@@ -1187,7 +1187,7 @@ class TestNotExclusiveRetry(CiTestCase):
 
         with self.assertRaises(util.NotExclusiveError):
             util.not_exclusive_retry(f, 1, 2, 3)
-        sleep.assert_called_once()
+        self.assertEqual(1, sleep.call_count)
 
     @mock.patch('curtin.util.time.sleep')
     def test_not_exclusive_retry_not_exclusive_once_then_error(self, sleep):
@@ -1195,6 +1195,6 @@ class TestNotExclusiveRetry(CiTestCase):
 
         with self.assertRaises(OSError):
             util.not_exclusive_retry(f, 1, 2, 3)
-        sleep.assert_called_once()
+        self.assertEqual(1, sleep.call_count)
 
 # vi: ts=4 expandtab syntax=python