curtin-dev team mailing list archive
-
curtin-dev team
-
Mailing list archive
-
Message #03481
[Merge] ~dbungert/curtin:py312 into curtin:master
Dan Bungert has proposed merging ~dbungert/curtin:py312 into curtin:master.
Commit message:
do not squash
Requested reviews:
curtin developers (curtin-dev)
For more details, see:
https://code.launchpad.net/~dbungert/curtin/+git/curtin/+merge/462809
Fix tests on python 3.12 by removing calls to deprecated unittest methods
--
Your team curtin developers is requested to review the proposed merge of ~dbungert/curtin:py312 into curtin:master.
diff --git a/tests/unittests/test_block_iscsi.py b/tests/unittests/test_block_iscsi.py
index 2a55f81..b69b804 100644
--- a/tests/unittests/test_block_iscsi.py
+++ b/tests/unittests/test_block_iscsi.py
@@ -11,62 +11,62 @@ from .helpers import CiTestCase
class TestBlockIscsiPortalParsing(CiTestCase):
def test_iscsi_portal_parsing_string(self):
- with self.assertRaisesRegexp(ValueError, 'not a string'):
+ with self.assertRaisesRegex(ValueError, 'not a string'):
iscsi.assert_valid_iscsi_portal(1234)
def test_iscsi_portal_parsing_no_port(self):
# port must be specified
- with self.assertRaisesRegexp(ValueError, 'not in the format'):
+ with self.assertRaisesRegex(ValueError, 'not in the format'):
iscsi.assert_valid_iscsi_portal('192.168.1.12')
- with self.assertRaisesRegexp(ValueError, 'not in the format'):
+ with self.assertRaisesRegex(ValueError, 'not in the format'):
iscsi.assert_valid_iscsi_portal('fe80::a634:d9ff:fe40:768a')
- with self.assertRaisesRegexp(ValueError, 'not in the format'):
+ with self.assertRaisesRegex(ValueError, 'not in the format'):
iscsi.assert_valid_iscsi_portal('192.168.1.12:')
- with self.assertRaisesRegexp(ValueError, 'not in the format'):
+ with self.assertRaisesRegex(ValueError, 'not in the format'):
iscsi.assert_valid_iscsi_portal('test.example.com:')
def test_iscsi_portal_parsing_valid_ip(self):
# IP must be in [] for IPv6, if not we misparse
host, port = iscsi.assert_valid_iscsi_portal(
'fe80::a634:d9ff:fe40:768a:9999')
- self.assertEquals(host, 'fe80::a634:d9ff:fe40:768a')
- self.assertEquals(port, 9999)
+ self.assertEqual(host, 'fe80::a634:d9ff:fe40:768a')
+ self.assertEqual(port, 9999)
# IP must not be in [] if port is specified for IPv4
- with self.assertRaisesRegexp(ValueError, 'Invalid IPv6 address'):
+ with self.assertRaisesRegex(ValueError, 'Invalid IPv6 address'):
iscsi.assert_valid_iscsi_portal('[192.168.1.12]:9000')
- with self.assertRaisesRegexp(ValueError, 'Invalid IPv6 address'):
+ with self.assertRaisesRegex(ValueError, 'Invalid IPv6 address'):
iscsi.assert_valid_iscsi_portal('[test.example.com]:8000')
def test_iscsi_portal_parsing_ip(self):
- with self.assertRaisesRegexp(ValueError, 'Invalid IPv6 address'):
+ with self.assertRaisesRegex(ValueError, 'Invalid IPv6 address'):
iscsi.assert_valid_iscsi_portal(
'[1200::AB00:1234::2552:7777:1313]:9999')
# cannot distinguish between bad IP and bad hostname
host, port = iscsi.assert_valid_iscsi_portal('192.168:9000')
- self.assertEquals(host, '192.168')
- self.assertEquals(port, 9000)
+ self.assertEqual(host, '192.168')
+ self.assertEqual(port, 9000)
def test_iscsi_portal_parsing_port(self):
- with self.assertRaisesRegexp(ValueError, 'not in the format'):
+ with self.assertRaisesRegex(ValueError, 'not in the format'):
iscsi.assert_valid_iscsi_portal('192.168.1.12:ABCD')
- with self.assertRaisesRegexp(ValueError, 'not in the format'):
+ with self.assertRaisesRegex(ValueError, 'not in the format'):
iscsi.assert_valid_iscsi_portal('[fe80::a634:d9ff:fe40:768a]:ABCD')
- with self.assertRaisesRegexp(ValueError, 'not in the format'):
+ with self.assertRaisesRegex(ValueError, 'not in the format'):
iscsi.assert_valid_iscsi_portal('test.example.com:ABCD')
def test_iscsi_portal_parsing_good_portals(self):
host, port = iscsi.assert_valid_iscsi_portal('192.168.1.12:9000')
- self.assertEquals(host, '192.168.1.12')
- self.assertEquals(port, 9000)
+ self.assertEqual(host, '192.168.1.12')
+ self.assertEqual(port, 9000)
host, port = iscsi.assert_valid_iscsi_portal(
'[fe80::a634:d9ff:fe40:768a]:9999')
- self.assertEquals(host, 'fe80::a634:d9ff:fe40:768a')
- self.assertEquals(port, 9999)
+ self.assertEqual(host, 'fe80::a634:d9ff:fe40:768a')
+ self.assertEqual(port, 9999)
host, port = iscsi.assert_valid_iscsi_portal('test.example.com:8000')
- self.assertEquals(host, 'test.example.com')
- self.assertEquals(port, 8000)
+ self.assertEqual(host, 'test.example.com')
+ self.assertEqual(port, 8000)
# disk specification:
# TARGETSPEC=host:proto:port:lun:targetname
@@ -74,73 +74,73 @@ class TestBlockIscsiPortalParsing(CiTestCase):
# root=iscsi:user:password@$TARGETSPEC
# root=iscsi:user:password:initiatoruser:initiatorpassword@$TARGETSPEC
def test_iscsi_disk_basic(self):
- with self.assertRaisesRegexp(ValueError, 'must be specified'):
+ with self.assertRaisesRegex(ValueError, 'must be specified'):
iscsi.IscsiDisk('')
# typo
- with self.assertRaisesRegexp(ValueError, 'must be specified'):
+ with self.assertRaisesRegex(ValueError, 'must be specified'):
iscsi.IscsiDisk('iscs:')
# no specification
- with self.assertRaisesRegexp(ValueError, 'must be specified'):
+ with self.assertRaisesRegex(ValueError, 'must be specified'):
iscsi.IscsiDisk('iscsi:')
- with self.assertRaisesRegexp(ValueError, 'Both host and targetname'):
+ with self.assertRaisesRegex(ValueError, 'Both host and targetname'):
iscsi.IscsiDisk('iscsi:::::')
def test_iscsi_disk_ip_valid(self):
# these are all misparses we cannot catch trivially
i = iscsi.IscsiDisk('iscsi:192.168::::target')
- self.assertEquals(i.user, None)
- self.assertEquals(i.password, None)
- self.assertEquals(i.iuser, None)
- self.assertEquals(i.ipassword, None)
- self.assertEquals(i.host, '192.168')
- self.assertEquals(i.proto, '6')
- self.assertEquals(i.port, 3260)
- self.assertEquals(i.lun, 0)
- self.assertEquals(i.target, 'target')
+ self.assertEqual(i.user, None)
+ self.assertEqual(i.password, None)
+ self.assertEqual(i.iuser, None)
+ self.assertEqual(i.ipassword, None)
+ self.assertEqual(i.host, '192.168')
+ self.assertEqual(i.proto, '6')
+ self.assertEqual(i.port, 3260)
+ self.assertEqual(i.lun, 0)
+ self.assertEqual(i.target, 'target')
i = iscsi.IscsiDisk('iscsi:[fe80::]::::target')
- self.assertEquals(i.user, None)
- self.assertEquals(i.password, None)
- self.assertEquals(i.iuser, None)
- self.assertEquals(i.ipassword, None)
- self.assertEquals(i.host, 'fe80::')
- self.assertEquals(i.proto, '6')
- self.assertEquals(i.port, 3260)
- self.assertEquals(i.lun, 0)
- self.assertEquals(i.target, 'target')
+ self.assertEqual(i.user, None)
+ self.assertEqual(i.password, None)
+ self.assertEqual(i.iuser, None)
+ self.assertEqual(i.ipassword, None)
+ self.assertEqual(i.host, 'fe80::')
+ self.assertEqual(i.proto, '6')
+ self.assertEqual(i.port, 3260)
+ self.assertEqual(i.lun, 0)
+ self.assertEqual(i.target, 'target')
i = iscsi.IscsiDisk('iscsi:test.example::::target')
- self.assertEquals(i.user, None)
- self.assertEquals(i.password, None)
- self.assertEquals(i.iuser, None)
- self.assertEquals(i.ipassword, None)
- self.assertEquals(i.host, 'test.example')
- self.assertEquals(i.proto, '6')
- self.assertEquals(i.port, 3260)
- self.assertEquals(i.lun, 0)
- self.assertEquals(i.target, 'target')
+ self.assertEqual(i.user, None)
+ self.assertEqual(i.password, None)
+ self.assertEqual(i.iuser, None)
+ self.assertEqual(i.ipassword, None)
+ self.assertEqual(i.host, 'test.example')
+ self.assertEqual(i.proto, '6')
+ self.assertEqual(i.port, 3260)
+ self.assertEqual(i.lun, 0)
+ self.assertEqual(i.target, 'target')
def test_iscsi_disk_port(self):
- with self.assertRaisesRegexp(ValueError, 'Specified iSCSI port'):
+ with self.assertRaisesRegex(ValueError, 'Specified iSCSI port'):
iscsi.IscsiDisk('iscsi:192.168.1.12::ABCD::target')
- with self.assertRaisesRegexp(ValueError, 'Specified iSCSI port'):
+ with self.assertRaisesRegex(ValueError, 'Specified iSCSI port'):
iscsi.IscsiDisk('iscsi:[fe80::a634:d9ff:fe40:768a:6]::ABCD::'
'target')
- with self.assertRaisesRegexp(ValueError, 'Specified iSCSI port'):
+ with self.assertRaisesRegex(ValueError, 'Specified iSCSI port'):
iscsi.IscsiDisk('iscsi:test.example.com::ABCD::target')
def test_iscsi_disk_target(self):
- with self.assertRaisesRegexp(ValueError, 'Both host and targetname'):
+ with self.assertRaisesRegex(ValueError, 'Both host and targetname'):
iscsi.IscsiDisk('iscsi:192.168.1.12::::')
- with self.assertRaisesRegexp(ValueError, 'Both host and targetname'):
+ with self.assertRaisesRegex(ValueError, 'Both host and targetname'):
iscsi.IscsiDisk('iscsi:[fe80::a634:d9ff:fe40:768a:6]::::')
- with self.assertRaisesRegexp(ValueError, 'Both host and targetname'):
+ with self.assertRaisesRegex(ValueError, 'Both host and targetname'):
iscsi.IscsiDisk('iscsi:test.example.com::::')
def test_iscsi_disk_ip(self):
- with self.assertRaisesRegexp(ValueError, 'Both host and targetname'):
+ with self.assertRaisesRegex(ValueError, 'Both host and targetname'):
iscsi.IscsiDisk('iscsi:::::target')
def test_iscsi_disk_auth(self):
@@ -165,321 +165,321 @@ class TestBlockIscsiPortalParsing(CiTestCase):
def test_iscsi_disk_good_ipv4(self):
i = iscsi.IscsiDisk('iscsi:192.168.1.12:6:3260:1:target')
- self.assertEquals(i.user, None)
- self.assertEquals(i.password, None)
- self.assertEquals(i.iuser, None)
- self.assertEquals(i.ipassword, None)
- self.assertEquals(i.host, '192.168.1.12')
- self.assertEquals(i.proto, '6')
- self.assertEquals(i.port, 3260)
- self.assertEquals(i.lun, 1)
- self.assertEquals(i.target, 'target')
+ self.assertEqual(i.user, None)
+ self.assertEqual(i.password, None)
+ self.assertEqual(i.iuser, None)
+ self.assertEqual(i.ipassword, None)
+ self.assertEqual(i.host, '192.168.1.12')
+ self.assertEqual(i.proto, '6')
+ self.assertEqual(i.port, 3260)
+ self.assertEqual(i.lun, 1)
+ self.assertEqual(i.target, 'target')
i = iscsi.IscsiDisk('iscsi:192.168.1.12::3260:1:target')
- self.assertEquals(i.user, None)
- self.assertEquals(i.password, None)
- self.assertEquals(i.iuser, None)
- self.assertEquals(i.ipassword, None)
- self.assertEquals(i.host, '192.168.1.12')
- self.assertEquals(i.proto, '6')
- self.assertEquals(i.port, 3260)
- self.assertEquals(i.lun, 1)
- self.assertEquals(i.target, 'target')
+ self.assertEqual(i.user, None)
+ self.assertEqual(i.password, None)
+ self.assertEqual(i.iuser, None)
+ self.assertEqual(i.ipassword, None)
+ self.assertEqual(i.host, '192.168.1.12')
+ self.assertEqual(i.proto, '6')
+ self.assertEqual(i.port, 3260)
+ self.assertEqual(i.lun, 1)
+ self.assertEqual(i.target, 'target')
i = iscsi.IscsiDisk('iscsi:192.168.1.12:::1:target')
- self.assertEquals(i.user, None)
- self.assertEquals(i.password, None)
- self.assertEquals(i.iuser, None)
- self.assertEquals(i.ipassword, None)
- self.assertEquals(i.host, '192.168.1.12')
- self.assertEquals(i.proto, '6')
- self.assertEquals(i.port, 3260)
- self.assertEquals(i.lun, 1)
- self.assertEquals(i.target, 'target')
+ self.assertEqual(i.user, None)
+ self.assertEqual(i.password, None)
+ self.assertEqual(i.iuser, None)
+ self.assertEqual(i.ipassword, None)
+ self.assertEqual(i.host, '192.168.1.12')
+ self.assertEqual(i.proto, '6')
+ self.assertEqual(i.port, 3260)
+ self.assertEqual(i.lun, 1)
+ self.assertEqual(i.target, 'target')
i = iscsi.IscsiDisk('iscsi:user:password@192.168.1.12:::1:target')
- self.assertEquals(i.user, 'user')
- self.assertEquals(i.password, 'password')
- self.assertEquals(i.iuser, None)
- self.assertEquals(i.ipassword, None)
- self.assertEquals(i.host, '192.168.1.12')
- self.assertEquals(i.proto, '6')
- self.assertEquals(i.port, 3260)
- self.assertEquals(i.lun, 1)
- self.assertEquals(i.target, 'target')
+ self.assertEqual(i.user, 'user')
+ self.assertEqual(i.password, 'password')
+ self.assertEqual(i.iuser, None)
+ self.assertEqual(i.ipassword, None)
+ self.assertEqual(i.host, '192.168.1.12')
+ self.assertEqual(i.proto, '6')
+ self.assertEqual(i.port, 3260)
+ self.assertEqual(i.lun, 1)
+ self.assertEqual(i.target, 'target')
i = iscsi.IscsiDisk('iscsi:user:@192.168.1.12:::1:target')
- self.assertEquals(i.user, 'user')
- self.assertEquals(i.password, '')
- self.assertEquals(i.iuser, None)
- self.assertEquals(i.ipassword, None)
- self.assertEquals(i.host, '192.168.1.12')
- self.assertEquals(i.proto, '6')
- self.assertEquals(i.port, 3260)
- self.assertEquals(i.lun, 1)
- self.assertEquals(i.target, 'target')
+ self.assertEqual(i.user, 'user')
+ self.assertEqual(i.password, '')
+ self.assertEqual(i.iuser, None)
+ self.assertEqual(i.ipassword, None)
+ self.assertEqual(i.host, '192.168.1.12')
+ self.assertEqual(i.proto, '6')
+ self.assertEqual(i.port, 3260)
+ self.assertEqual(i.lun, 1)
+ self.assertEqual(i.target, 'target')
i = iscsi.IscsiDisk('iscsi:user:password:iuser:ipassword@'
'192.168.1.12:::1:target')
- self.assertEquals(i.user, 'user')
- self.assertEquals(i.password, 'password')
- self.assertEquals(i.iuser, 'iuser')
- self.assertEquals(i.ipassword, 'ipassword')
- self.assertEquals(i.host, '192.168.1.12')
- self.assertEquals(i.proto, '6')
- self.assertEquals(i.port, 3260)
- self.assertEquals(i.lun, 1)
- self.assertEquals(i.target, 'target')
+ self.assertEqual(i.user, 'user')
+ self.assertEqual(i.password, 'password')
+ self.assertEqual(i.iuser, 'iuser')
+ self.assertEqual(i.ipassword, 'ipassword')
+ self.assertEqual(i.host, '192.168.1.12')
+ self.assertEqual(i.proto, '6')
+ self.assertEqual(i.port, 3260)
+ self.assertEqual(i.lun, 1)
+ self.assertEqual(i.target, 'target')
i = iscsi.IscsiDisk('iscsi:user:password:iuser:@'
'192.168.1.12:::1:target')
- self.assertEquals(i.user, 'user')
- self.assertEquals(i.password, 'password')
- self.assertEquals(i.iuser, 'iuser')
- self.assertEquals(i.ipassword, '')
- self.assertEquals(i.host, '192.168.1.12')
- self.assertEquals(i.proto, '6')
- self.assertEquals(i.port, 3260)
- self.assertEquals(i.lun, 1)
- self.assertEquals(i.target, 'target')
+ self.assertEqual(i.user, 'user')
+ self.assertEqual(i.password, 'password')
+ self.assertEqual(i.iuser, 'iuser')
+ self.assertEqual(i.ipassword, '')
+ self.assertEqual(i.host, '192.168.1.12')
+ self.assertEqual(i.proto, '6')
+ self.assertEqual(i.port, 3260)
+ self.assertEqual(i.lun, 1)
+ self.assertEqual(i.target, 'target')
i = iscsi.IscsiDisk('iscsi:user::iuser:@192.168.1.12:::1:target')
- self.assertEquals(i.user, 'user')
- self.assertEquals(i.password, '')
- self.assertEquals(i.iuser, 'iuser')
- self.assertEquals(i.ipassword, '')
- self.assertEquals(i.host, '192.168.1.12')
- self.assertEquals(i.proto, '6')
- self.assertEquals(i.port, 3260)
- self.assertEquals(i.lun, 1)
- self.assertEquals(i.target, 'target')
+ self.assertEqual(i.user, 'user')
+ self.assertEqual(i.password, '')
+ self.assertEqual(i.iuser, 'iuser')
+ self.assertEqual(i.ipassword, '')
+ self.assertEqual(i.host, '192.168.1.12')
+ self.assertEqual(i.proto, '6')
+ self.assertEqual(i.port, 3260)
+ self.assertEqual(i.lun, 1)
+ self.assertEqual(i.target, 'target')
def test_iscsi_disk_good_ipv6(self):
i = iscsi.IscsiDisk(
'iscsi:[fe80::a634:d9ff:fe40:768a:6]:5:3260:1:target')
- self.assertEquals(i.user, None)
- self.assertEquals(i.password, None)
- self.assertEquals(i.iuser, None)
- self.assertEquals(i.ipassword, None)
- self.assertEquals(i.host, 'fe80::a634:d9ff:fe40:768a:6')
- self.assertEquals(i.proto, '6')
- self.assertEquals(i.port, 3260)
- self.assertEquals(i.lun, 1)
- self.assertEquals(i.target, 'target')
+ self.assertEqual(i.user, None)
+ self.assertEqual(i.password, None)
+ self.assertEqual(i.iuser, None)
+ self.assertEqual(i.ipassword, None)
+ self.assertEqual(i.host, 'fe80::a634:d9ff:fe40:768a:6')
+ self.assertEqual(i.proto, '6')
+ self.assertEqual(i.port, 3260)
+ self.assertEqual(i.lun, 1)
+ self.assertEqual(i.target, 'target')
i = iscsi.IscsiDisk(
'iscsi:[fe80::a634:d9ff:fe40:768a:6]::3260:1:target')
- self.assertEquals(i.user, None)
- self.assertEquals(i.password, None)
- self.assertEquals(i.iuser, None)
- self.assertEquals(i.ipassword, None)
- self.assertEquals(i.host, 'fe80::a634:d9ff:fe40:768a:6')
- self.assertEquals(i.proto, '6')
- self.assertEquals(i.port, 3260)
- self.assertEquals(i.lun, 1)
- self.assertEquals(i.target, 'target')
+ self.assertEqual(i.user, None)
+ self.assertEqual(i.password, None)
+ self.assertEqual(i.iuser, None)
+ self.assertEqual(i.ipassword, None)
+ self.assertEqual(i.host, 'fe80::a634:d9ff:fe40:768a:6')
+ self.assertEqual(i.proto, '6')
+ self.assertEqual(i.port, 3260)
+ self.assertEqual(i.lun, 1)
+ self.assertEqual(i.target, 'target')
i = iscsi.IscsiDisk('iscsi:[fe80::a634:d9ff:fe40:768a:6]:::1:target')
- self.assertEquals(i.user, None)
- self.assertEquals(i.password, None)
- self.assertEquals(i.iuser, None)
- self.assertEquals(i.ipassword, None)
- self.assertEquals(i.host, 'fe80::a634:d9ff:fe40:768a:6')
- self.assertEquals(i.proto, '6')
- self.assertEquals(i.port, 3260)
- self.assertEquals(i.lun, 1)
- self.assertEquals(i.target, 'target')
+ self.assertEqual(i.user, None)
+ self.assertEqual(i.password, None)
+ self.assertEqual(i.iuser, None)
+ self.assertEqual(i.ipassword, None)
+ self.assertEqual(i.host, 'fe80::a634:d9ff:fe40:768a:6')
+ self.assertEqual(i.proto, '6')
+ self.assertEqual(i.port, 3260)
+ self.assertEqual(i.lun, 1)
+ self.assertEqual(i.target, 'target')
i = iscsi.IscsiDisk('iscsi:user:password@'
'[fe80::a634:d9ff:fe40:768a:6]:::1:target')
- self.assertEquals(i.user, 'user')
- self.assertEquals(i.password, 'password')
- self.assertEquals(i.iuser, None)
- self.assertEquals(i.ipassword, None)
- self.assertEquals(i.host, 'fe80::a634:d9ff:fe40:768a:6')
- self.assertEquals(i.proto, '6')
- self.assertEquals(i.port, 3260)
- self.assertEquals(i.lun, 1)
- self.assertEquals(i.target, 'target')
+ self.assertEqual(i.user, 'user')
+ self.assertEqual(i.password, 'password')
+ self.assertEqual(i.iuser, None)
+ self.assertEqual(i.ipassword, None)
+ self.assertEqual(i.host, 'fe80::a634:d9ff:fe40:768a:6')
+ self.assertEqual(i.proto, '6')
+ self.assertEqual(i.port, 3260)
+ self.assertEqual(i.lun, 1)
+ self.assertEqual(i.target, 'target')
i = iscsi.IscsiDisk('iscsi:user:@'
'[fe80::a634:d9ff:fe40:768a:6]:::1:target')
- self.assertEquals(i.user, 'user')
- self.assertEquals(i.password, '')
- self.assertEquals(i.iuser, None)
- self.assertEquals(i.ipassword, None)
- self.assertEquals(i.host, 'fe80::a634:d9ff:fe40:768a:6')
- self.assertEquals(i.proto, '6')
- self.assertEquals(i.port, 3260)
- self.assertEquals(i.lun, 1)
- self.assertEquals(i.target, 'target')
+ self.assertEqual(i.user, 'user')
+ self.assertEqual(i.password, '')
+ self.assertEqual(i.iuser, None)
+ self.assertEqual(i.ipassword, None)
+ self.assertEqual(i.host, 'fe80::a634:d9ff:fe40:768a:6')
+ self.assertEqual(i.proto, '6')
+ self.assertEqual(i.port, 3260)
+ self.assertEqual(i.lun, 1)
+ self.assertEqual(i.target, 'target')
i = iscsi.IscsiDisk('iscsi:user:password:iuser:ipassword@'
'[fe80::a634:d9ff:fe40:768a:6]:::1:target')
- self.assertEquals(i.user, 'user')
- self.assertEquals(i.password, 'password')
- self.assertEquals(i.iuser, 'iuser')
- self.assertEquals(i.ipassword, 'ipassword')
- self.assertEquals(i.host, 'fe80::a634:d9ff:fe40:768a:6')
- self.assertEquals(i.proto, '6')
- self.assertEquals(i.port, 3260)
- self.assertEquals(i.lun, 1)
- self.assertEquals(i.target, 'target')
+ self.assertEqual(i.user, 'user')
+ self.assertEqual(i.password, 'password')
+ self.assertEqual(i.iuser, 'iuser')
+ self.assertEqual(i.ipassword, 'ipassword')
+ self.assertEqual(i.host, 'fe80::a634:d9ff:fe40:768a:6')
+ self.assertEqual(i.proto, '6')
+ self.assertEqual(i.port, 3260)
+ self.assertEqual(i.lun, 1)
+ self.assertEqual(i.target, 'target')
i = iscsi.IscsiDisk('iscsi:user:password:iuser:@'
'[fe80::a634:d9ff:fe40:768a:6]:::1:target')
- self.assertEquals(i.user, 'user')
- self.assertEquals(i.password, 'password')
- self.assertEquals(i.iuser, 'iuser')
- self.assertEquals(i.ipassword, '')
- self.assertEquals(i.host, 'fe80::a634:d9ff:fe40:768a:6')
- self.assertEquals(i.proto, '6')
- self.assertEquals(i.port, 3260)
- self.assertEquals(i.lun, 1)
- self.assertEquals(i.target, 'target')
+ self.assertEqual(i.user, 'user')
+ self.assertEqual(i.password, 'password')
+ self.assertEqual(i.iuser, 'iuser')
+ self.assertEqual(i.ipassword, '')
+ self.assertEqual(i.host, 'fe80::a634:d9ff:fe40:768a:6')
+ self.assertEqual(i.proto, '6')
+ self.assertEqual(i.port, 3260)
+ self.assertEqual(i.lun, 1)
+ self.assertEqual(i.target, 'target')
i = iscsi.IscsiDisk('iscsi:user::iuser:@'
'[fe80::a634:d9ff:fe40:768a:6]:::1:target')
- self.assertEquals(i.user, 'user')
- self.assertEquals(i.password, '')
- self.assertEquals(i.iuser, 'iuser')
- self.assertEquals(i.ipassword, '')
- self.assertEquals(i.host, 'fe80::a634:d9ff:fe40:768a:6')
- self.assertEquals(i.proto, '6')
- self.assertEquals(i.port, 3260)
- self.assertEquals(i.lun, 1)
- self.assertEquals(i.target, 'target')
+ self.assertEqual(i.user, 'user')
+ self.assertEqual(i.password, '')
+ self.assertEqual(i.iuser, 'iuser')
+ self.assertEqual(i.ipassword, '')
+ self.assertEqual(i.host, 'fe80::a634:d9ff:fe40:768a:6')
+ self.assertEqual(i.proto, '6')
+ self.assertEqual(i.port, 3260)
+ self.assertEqual(i.lun, 1)
+ self.assertEqual(i.target, 'target')
def test_iscsi_disk_good_hostname(self):
i = iscsi.IscsiDisk('iscsi:test.example.com:6:3260:1:target')
- self.assertEquals(i.user, None)
- self.assertEquals(i.password, None)
- self.assertEquals(i.iuser, None)
- self.assertEquals(i.ipassword, None)
- self.assertEquals(i.host, 'test.example.com')
- self.assertEquals(i.proto, '6')
- self.assertEquals(i.port, 3260)
- self.assertEquals(i.lun, 1)
- self.assertEquals(i.target, 'target')
+ self.assertEqual(i.user, None)
+ self.assertEqual(i.password, None)
+ self.assertEqual(i.iuser, None)
+ self.assertEqual(i.ipassword, None)
+ self.assertEqual(i.host, 'test.example.com')
+ self.assertEqual(i.proto, '6')
+ self.assertEqual(i.port, 3260)
+ self.assertEqual(i.lun, 1)
+ self.assertEqual(i.target, 'target')
i = iscsi.IscsiDisk('iscsi:test.example.com::3260:1:target')
- self.assertEquals(i.user, None)
- self.assertEquals(i.password, None)
- self.assertEquals(i.iuser, None)
- self.assertEquals(i.ipassword, None)
- self.assertEquals(i.host, 'test.example.com')
- self.assertEquals(i.proto, '6')
- self.assertEquals(i.port, 3260)
- self.assertEquals(i.lun, 1)
- self.assertEquals(i.target, 'target')
+ self.assertEqual(i.user, None)
+ self.assertEqual(i.password, None)
+ self.assertEqual(i.iuser, None)
+ self.assertEqual(i.ipassword, None)
+ self.assertEqual(i.host, 'test.example.com')
+ self.assertEqual(i.proto, '6')
+ self.assertEqual(i.port, 3260)
+ self.assertEqual(i.lun, 1)
+ self.assertEqual(i.target, 'target')
i = iscsi.IscsiDisk('iscsi:test.example.com:::1:target')
- self.assertEquals(i.user, None)
- self.assertEquals(i.password, None)
- self.assertEquals(i.iuser, None)
- self.assertEquals(i.ipassword, None)
- self.assertEquals(i.host, 'test.example.com')
- self.assertEquals(i.proto, '6')
- self.assertEquals(i.port, 3260)
- self.assertEquals(i.lun, 1)
- self.assertEquals(i.target, 'target')
+ self.assertEqual(i.user, None)
+ self.assertEqual(i.password, None)
+ self.assertEqual(i.iuser, None)
+ self.assertEqual(i.ipassword, None)
+ self.assertEqual(i.host, 'test.example.com')
+ self.assertEqual(i.proto, '6')
+ self.assertEqual(i.port, 3260)
+ self.assertEqual(i.lun, 1)
+ self.assertEqual(i.target, 'target')
i = iscsi.IscsiDisk('iscsi:user:password@xxxxxxxxxxxxxxxx:::1:target')
- self.assertEquals(i.user, 'user')
- self.assertEquals(i.password, 'password')
- self.assertEquals(i.iuser, None)
- self.assertEquals(i.ipassword, None)
- self.assertEquals(i.host, 'test.example.com')
- self.assertEquals(i.proto, '6')
- self.assertEquals(i.port, 3260)
- self.assertEquals(i.lun, 1)
- self.assertEquals(i.target, 'target')
+ self.assertEqual(i.user, 'user')
+ self.assertEqual(i.password, 'password')
+ self.assertEqual(i.iuser, None)
+ self.assertEqual(i.ipassword, None)
+ self.assertEqual(i.host, 'test.example.com')
+ self.assertEqual(i.proto, '6')
+ self.assertEqual(i.port, 3260)
+ self.assertEqual(i.lun, 1)
+ self.assertEqual(i.target, 'target')
i = iscsi.IscsiDisk('iscsi:user:@test.example.com:::1:target')
- self.assertEquals(i.user, 'user')
- self.assertEquals(i.password, '')
- self.assertEquals(i.iuser, None)
- self.assertEquals(i.ipassword, None)
- self.assertEquals(i.host, 'test.example.com')
- self.assertEquals(i.proto, '6')
- self.assertEquals(i.port, 3260)
- self.assertEquals(i.lun, 1)
- self.assertEquals(i.target, 'target')
+ self.assertEqual(i.user, 'user')
+ self.assertEqual(i.password, '')
+ self.assertEqual(i.iuser, None)
+ self.assertEqual(i.ipassword, None)
+ self.assertEqual(i.host, 'test.example.com')
+ self.assertEqual(i.proto, '6')
+ self.assertEqual(i.port, 3260)
+ self.assertEqual(i.lun, 1)
+ self.assertEqual(i.target, 'target')
i = iscsi.IscsiDisk('iscsi:user:password:iuser:ipassword@'
'test.example.com:::1:target')
- self.assertEquals(i.user, 'user')
- self.assertEquals(i.password, 'password')
- self.assertEquals(i.iuser, 'iuser')
- self.assertEquals(i.ipassword, 'ipassword')
- self.assertEquals(i.host, 'test.example.com')
- self.assertEquals(i.proto, '6')
- self.assertEquals(i.port, 3260)
- self.assertEquals(i.lun, 1)
- self.assertEquals(i.target, 'target')
+ self.assertEqual(i.user, 'user')
+ self.assertEqual(i.password, 'password')
+ self.assertEqual(i.iuser, 'iuser')
+ self.assertEqual(i.ipassword, 'ipassword')
+ self.assertEqual(i.host, 'test.example.com')
+ self.assertEqual(i.proto, '6')
+ self.assertEqual(i.port, 3260)
+ self.assertEqual(i.lun, 1)
+ self.assertEqual(i.target, 'target')
i = iscsi.IscsiDisk('iscsi:user:password:iuser:@'
'test.example.com:::1:target')
- self.assertEquals(i.user, 'user')
- self.assertEquals(i.password, 'password')
- self.assertEquals(i.iuser, 'iuser')
- self.assertEquals(i.ipassword, '')
- self.assertEquals(i.host, 'test.example.com')
- self.assertEquals(i.proto, '6')
- self.assertEquals(i.port, 3260)
- self.assertEquals(i.lun, 1)
- self.assertEquals(i.target, 'target')
+ self.assertEqual(i.user, 'user')
+ self.assertEqual(i.password, 'password')
+ self.assertEqual(i.iuser, 'iuser')
+ self.assertEqual(i.ipassword, '')
+ self.assertEqual(i.host, 'test.example.com')
+ self.assertEqual(i.proto, '6')
+ self.assertEqual(i.port, 3260)
+ self.assertEqual(i.lun, 1)
+ self.assertEqual(i.target, 'target')
i = iscsi.IscsiDisk('iscsi:user::iuser:@test.example.com:::1:target')
- self.assertEquals(i.user, 'user')
- self.assertEquals(i.password, '')
- self.assertEquals(i.iuser, 'iuser')
- self.assertEquals(i.ipassword, '')
- self.assertEquals(i.host, 'test.example.com')
- self.assertEquals(i.proto, '6')
- self.assertEquals(i.port, 3260)
- self.assertEquals(i.lun, 1)
- self.assertEquals(i.target, 'target')
+ self.assertEqual(i.user, 'user')
+ self.assertEqual(i.password, '')
+ self.assertEqual(i.iuser, 'iuser')
+ self.assertEqual(i.ipassword, '')
+ self.assertEqual(i.host, 'test.example.com')
+ self.assertEqual(i.proto, '6')
+ self.assertEqual(i.port, 3260)
+ self.assertEqual(i.lun, 1)
+ self.assertEqual(i.target, 'target')
# LP: #1679222
def test_iscsi_target_parsing(self):
i = iscsi.IscsiDisk(
'iscsi:192.168.1.12::::iqn.2017-04.com.example.test:target-name')
- self.assertEquals(i.user, None)
- self.assertEquals(i.password, None)
- self.assertEquals(i.iuser, None)
- self.assertEquals(i.ipassword, None)
- self.assertEquals(i.host, '192.168.1.12')
- self.assertEquals(i.proto, '6')
- self.assertEquals(i.port, 3260)
- self.assertEquals(i.lun, 0)
- self.assertEquals(i.target, 'iqn.2017-04.com.example.test:target-name')
+ self.assertEqual(i.user, None)
+ self.assertEqual(i.password, None)
+ self.assertEqual(i.iuser, None)
+ self.assertEqual(i.ipassword, None)
+ self.assertEqual(i.host, '192.168.1.12')
+ self.assertEqual(i.proto, '6')
+ self.assertEqual(i.port, 3260)
+ self.assertEqual(i.lun, 0)
+ self.assertEqual(i.target, 'iqn.2017-04.com.example.test:target-name')
i = iscsi.IscsiDisk(
'iscsi:[fe80::a634:d9ff:fe40:768a:6]::::'
'iqn.2017-04.com.example.test:target-name')
- self.assertEquals(i.user, None)
- self.assertEquals(i.password, None)
- self.assertEquals(i.iuser, None)
- self.assertEquals(i.ipassword, None)
- self.assertEquals(i.host, 'fe80::a634:d9ff:fe40:768a:6')
- self.assertEquals(i.proto, '6')
- self.assertEquals(i.port, 3260)
- self.assertEquals(i.lun, 0)
- self.assertEquals(i.target, 'iqn.2017-04.com.example.test:target-name')
+ self.assertEqual(i.user, None)
+ self.assertEqual(i.password, None)
+ self.assertEqual(i.iuser, None)
+ self.assertEqual(i.ipassword, None)
+ self.assertEqual(i.host, 'fe80::a634:d9ff:fe40:768a:6')
+ self.assertEqual(i.proto, '6')
+ self.assertEqual(i.port, 3260)
+ self.assertEqual(i.lun, 0)
+ self.assertEqual(i.target, 'iqn.2017-04.com.example.test:target-name')
i = iscsi.IscsiDisk(
'iscsi:test.example.com::::'
'iqn.2017-04.com.example.test:target-name')
- self.assertEquals(i.user, None)
- self.assertEquals(i.password, None)
- self.assertEquals(i.iuser, None)
- self.assertEquals(i.ipassword, None)
- self.assertEquals(i.host, 'test.example.com')
- self.assertEquals(i.proto, '6')
- self.assertEquals(i.port, 3260)
- self.assertEquals(i.lun, 0)
- self.assertEquals(i.target, 'iqn.2017-04.com.example.test:target-name')
+ self.assertEqual(i.user, None)
+ self.assertEqual(i.password, None)
+ self.assertEqual(i.iuser, None)
+ self.assertEqual(i.ipassword, None)
+ self.assertEqual(i.host, 'test.example.com')
+ self.assertEqual(i.proto, '6')
+ self.assertEqual(i.port, 3260)
+ self.assertEqual(i.lun, 0)
+ self.assertEqual(i.target, 'iqn.2017-04.com.example.test:target-name')
class TestBlockIscsiVolPath(CiTestCase):
diff --git a/tests/unittests/test_block_mkfs.py b/tests/unittests/test_block_mkfs.py
index f8c81eb..756e477 100644
--- a/tests/unittests/test_block_mkfs.py
+++ b/tests/unittests/test_block_mkfs.py
@@ -25,14 +25,14 @@ class TestBlockMkfs(CiTestCase):
self.assertIn(flag_name, call)
flag_index = call.index(flag_name)
self.assertTrue(len(call) > flag_index)
- self.assertEquals(call[flag_index + 1], flag_val)
+ self.assertEqual(call[flag_index + 1], flag_val)
call.remove(flag_name)
call.remove(flag_val)
else:
self.assertIn(flag, call)
call.remove(flag)
# Only remaining vals in call should be mkfs.fstype and dev path
- self.assertEquals(len(call), 2)
+ self.assertEqual(len(call), 2)
@mock.patch("curtin.block.mkfs.block")
@mock.patch("curtin.block.mkfs.os")
@@ -49,12 +49,12 @@ class TestBlockMkfs(CiTestCase):
mkfs.mkfs_from_config("/dev/null", config, strict=strict)
self.assertTrue(mock_util.subp.called)
calls = mock_util.subp.call_args_list
- self.assertEquals(len(calls), 1)
+ self.assertEqual(len(calls), 1)
# Get first function call, tuple of first positional arg and its
# (nonexistant) keyword arg, and unpack to get cmd
call = calls[0][0][0]
- self.assertEquals(call[0], expected_cmd)
+ self.assertEqual(call[0], expected_cmd)
self._assert_same_flags(call, expected_flags)
def test_mkfs_ext(self):
@@ -155,9 +155,9 @@ class TestBlockMkfs(CiTestCase):
label="testlabel", force=True)
expected_flags = ["-F", ["-L", "testlabel"], ["-U", self.test_uuid]]
calls = mock_util.subp.call_args_list
- self.assertEquals(len(calls), 1)
+ self.assertEqual(len(calls), 1)
call = calls[0][0][0]
- self.assertEquals(call[0], "mkfs.ext4")
+ self.assertEqual(call[0], "mkfs.ext4")
self._assert_same_flags(call, expected_flags)
@mock.patch("curtin.block.mkfs.os")
diff --git a/tests/unittests/test_block_zfs.py b/tests/unittests/test_block_zfs.py
index dd80caf..ef24b5d 100644
--- a/tests/unittests/test_block_zfs.py
+++ b/tests/unittests/test_block_zfs.py
@@ -112,7 +112,7 @@ class TestBlockZfsZpoolCreate(CiTestCase):
for val in [None, '', {'a': 1}, 'mydev']:
with self.assertRaises(TypeError):
# All the assert methods (except assertRaises(),
- # assertRaisesRegexp()) accept a msg argument that,
+ # assertRaisesRegex()) accept a msg argument that,
# if specified, is used as the error message on failure
print('vdev value: %s' % val)
zfs.zpool_create('mypool', val)
diff --git a/tests/unittests/test_commands_block_meta.py b/tests/unittests/test_commands_block_meta.py
index ed58cc1..78cba06 100644
--- a/tests/unittests/test_commands_block_meta.py
+++ b/tests/unittests/test_commands_block_meta.py
@@ -1030,14 +1030,14 @@ class TestFstabData(CiTestCase):
"""mount_data on non-mount type raises ValueError."""
mnt = self.mnt.copy()
mnt['type'] = "not-mount"
- with self.assertRaisesRegexp(ValueError, r".*not type 'mount'"):
+ with self.assertRaisesRegex(ValueError, r".*not type 'mount'"):
block_meta.mount_data(mnt, {mnt['id']: mnt})
def test_mount_data_no_device_or_spec_raises_valueerror(self):
"""test_mount_data raises ValueError if no device or spec."""
mnt = self.mnt.copy()
del mnt['device']
- with self.assertRaisesRegexp(ValueError, r".*mount.*missing.*"):
+ with self.assertRaisesRegex(ValueError, r".*mount.*missing.*"):
block_meta.mount_data(mnt, {mnt['id']: mnt})
def test_mount_data_invalid_device_ref_raises_valueerror(self):
@@ -1045,7 +1045,7 @@ class TestFstabData(CiTestCase):
mnt = self.mnt.copy()
mnt['device'] = 'myinvalid'
scfg = OrderedDict([(i['id'], i) for i in self.base_cfg + [mnt]])
- with self.assertRaisesRegexp(ValueError, r".*refers.*myinvalid"):
+ with self.assertRaisesRegex(ValueError, r".*refers.*myinvalid"):
block_meta.mount_data(mnt, scfg)
def test_mount_data_invalid_format_ref_raises_valueerror(self):
@@ -1054,7 +1054,7 @@ class TestFstabData(CiTestCase):
scfg = OrderedDict([(i['id'], i) for i in mycfg])
# change the 'volume' entry for the 'format' type.
scfg['fs1']['volume'] = 'myinvalidvol'
- with self.assertRaisesRegexp(ValueError, r".*refers.*myinvalidvol"):
+ with self.assertRaisesRegex(ValueError, r".*refers.*myinvalidvol"):
block_meta.mount_data(scfg['m1'], scfg)
def test_non_device_mount_with_spec(self):
@@ -1206,7 +1206,7 @@ class TestFstabData(CiTestCase):
"""fstab_line_for_data raises ValueError if no path and not swap."""
fdata = block_meta.FstabData(
spec="/dev/disk2", device=None, path="", fstype='ext3')
- with self.assertRaisesRegexp(ValueError, r".*empty.*path"):
+ with self.assertRaisesRegex(ValueError, r".*empty.*path"):
block_meta.fstab_line_for_data(fdata)
def test_fstab_line_for_data_with_options(self):
@@ -1269,7 +1269,7 @@ class TestFstabData(CiTestCase):
fdata = block_meta.FstabData(
spec=None, device=None, path="/", fstype='ext3')
match = r".*missing.*spec.*device"
- with self.assertRaisesRegexp(ValueError, match):
+ with self.assertRaisesRegex(ValueError, match):
block_meta.fstab_line_for_data(fdata)
@patch('curtin.commands.block_meta._get_volume_type')
@@ -1425,7 +1425,7 @@ class TestFstabData(CiTestCase):
m_subp.side_effect = my_error
mp = self.tmp_path("my-mountpoint")
- with self.assertRaisesRegexp(RuntimeError, r"Mount failed.*"):
+ with self.assertRaisesRegex(RuntimeError, r"Mount failed.*"):
block_meta.mount_fstab_data(
block_meta.FstabData(device="/dev/disk1", path="/var"),
target=mp)
diff --git a/tests/unittests/test_commands_net_meta.py b/tests/unittests/test_commands_net_meta.py
index 86dc036..30f09b9 100644
--- a/tests/unittests/test_commands_net_meta.py
+++ b/tests/unittests/test_commands_net_meta.py
@@ -76,7 +76,7 @@ class TestNetMeta(CiTestCase):
self.assertEqual(0, self.m_command_env.call_count)
self.assertEqual(0, self.m_command_config.call_count)
- self.assertEquals(self.args.mode, 'disabled')
+ self.assertEqual(self.args.mode, 'disabled')
self.assertEqual(0, self.m_os_environ.get.call_count)
self.assertEqual(0, self.m_dump_config.call_count)
self.assertFalse(os.path.exists(self.output_network_path))
@@ -98,7 +98,7 @@ class TestNetMeta(CiTestCase):
self.assertEqual(self.expected_exit_code, cm.exception.code)
self.m_run_hook.assert_called_with(
self.args.target, 'network-config')
- self.assertEquals(self.args.mode, 'custom')
+ self.assertEqual(self.args.mode, 'custom')
self.assertEqual(
expected_m_command_env_calls, self.m_command_env.call_count)
self.assertEqual(
diff --git a/tests/unittests/test_curthooks.py b/tests/unittests/test_curthooks.py
index 52350ec..b73a19f 100644
--- a/tests/unittests/test_curthooks.py
+++ b/tests/unittests/test_curthooks.py
@@ -41,7 +41,7 @@ class TestGetFlashKernelPkgs(CiTestCase):
def test__returns_flash_kernel_pkgs(self):
self.mock_subp.return_value = 'u-boot-tools', ''
- self.assertEquals(
+ self.assertEqual(
'u-boot-tools', curthooks.get_flash_kernel_pkgs('arm64', False))
self.mock_subp.assert_called_with(
['list-flash-kernel-packages'], capture=True)
@@ -859,7 +859,7 @@ class TestSetupGrub(CiTestCase):
self.mock_haspkg.return_value = False
curthooks.setup_grub(cfg, self.target, osfamily=self.distro_family,
variant=self.variant)
- self.assertEquals([
+ self.assertEqual([
call(['efibootmgr', '-o', '0001,0000'], target=self.target)],
self.mock_subp.call_args_list)
@@ -902,7 +902,7 @@ class TestSetupGrub(CiTestCase):
logs = self.logs.getvalue()
print(logs)
print(self.mock_subp.call_args_list)
- self.assertEquals([], self.mock_subp.call_args_list)
+ self.assertEqual([], self.mock_subp.call_args_list)
self.assertIn("Using fallback UEFI reordering:", logs)
self.assertIn("missing 'BootCurrent' value", logs)
self.assertIn("Found new boot entries: ['0000']", logs)
@@ -953,7 +953,7 @@ class TestSetupGrub(CiTestCase):
logs = self.logs.getvalue()
print(logs)
- self.assertEquals([], self.mock_subp.call_args_list)
+ self.assertEqual([], self.mock_subp.call_args_list)
self.assertIn("Using fallback UEFI reordering:", logs)
self.assertIn("missing 'BootCurrent' value", logs)
self.assertIn("Current and Previous bootorders match", logs)
@@ -1062,7 +1062,7 @@ class TestSetupGrub(CiTestCase):
logs = self.logs.getvalue()
print(logs)
print('Number of bootmgr calls: %s' % self.mock_efibootmgr.call_count)
- self.assertEquals([
+ self.assertEqual([
call(['efibootmgr', '-o', '%s' % (",".join(final_state.order))],
target=self.target)],
self.mock_subp.call_args_list)
@@ -1140,7 +1140,7 @@ class TestUefiRemoveDuplicateEntries(CiTestCase):
remove_duplicate_entries=False,
)
curthooks.uefi_remove_duplicate_entries(grubcfg, self.target)
- self.assertEquals([], self.m_subp.call_args_list)
+ self.assertEqual([], self.m_subp.call_args_list)
@patch.object(util.ChrootableTarget, "__enter__", new=lambda a: a)
def test_uefi_remove_duplicate_entries_skip_bootcurrent(self):
diff --git a/tests/unittests/test_reporter.py b/tests/unittests/test_reporter.py
index bce3e13..123c684 100644
--- a/tests/unittests/test_reporter.py
+++ b/tests/unittests/test_reporter.py
@@ -123,7 +123,7 @@ class TestReporter(CiTestCase):
webhook_handler.publish_event(event)
webhook_handler = handlers.WebHookHandler('127.0.0.1:8000',
level="INVALID")
- self.assertEquals(webhook_handler.level, 30)
+ self.assertEqual(webhook_handler.level, 30)
@patch('curtin.reporter.events.report_event')
def test_report_start_event(self, mock_report_event):
diff --git a/tests/unittests/test_url_helper.py b/tests/unittests/test_url_helper.py
index 9ed37ff..81d5fdd 100644
--- a/tests/unittests/test_url_helper.py
+++ b/tests/unittests/test_url_helper.py
@@ -33,7 +33,7 @@ class TestDownload(CiTestCase):
self.assertRaises(url_helper.UrlError, url_helper.download,
"file://" + self.src_file, self.target_file,
retries=3, retry_delay=0)
- self.assertEquals(4, urlreader_mock.call_count,
+ self.assertEqual(4, urlreader_mock.call_count,
"Didn't call UrlReader 4 times (retries=3)")
@mock.patch('curtin.url_helper.UrlReader')
@@ -45,7 +45,7 @@ class TestDownload(CiTestCase):
self.assertRaises(url_helper.UrlError, url_helper.download,
"file://" + self.src_file, self.target_file,
retry_delay=0)
- self.assertEquals(1, urlreader_mock.call_count,
+ self.assertEqual(1, urlreader_mock.call_count,
"Didn't call UrlReader once (retries=0)")
@mock.patch('curtin.url_helper.UrlReader')
@@ -56,7 +56,7 @@ class TestDownload(CiTestCase):
self.assertRaises(url_helper.UrlError, url_helper.download,
"file://" + self.src_file, self.target_file,
retries=3, retry_delay=0)
- self.assertEquals(1, urlreader_mock.call_count,
+ self.assertEqual(1, urlreader_mock.call_count,
"Didn't call UrlReader once (400 class error)")
def test_download_file_url_retry_then_success(self):
@@ -71,7 +71,7 @@ class TestDownload(CiTestCase):
urlreader_mock.side_effect = urlreader_download
url_helper.download("file://" + self.src_file, self.target_file,
retries=3, retry_delay=0)
- self.assertEquals(2, urlreader_mock.call_count,
+ self.assertEqual(2, urlreader_mock.call_count,
"Didn't call UrlReader twice (first failing,"
"then success)")
self.assertTrue(filecmp.cmp(self.src_file, self.target_file),
diff --git a/tests/unittests/test_util.py b/tests/unittests/test_util.py
index 96f260f..93dde91 100644
--- a/tests/unittests/test_util.py
+++ b/tests/unittests/test_util.py
@@ -439,20 +439,20 @@ class TestGetUnsharePidArgs(CiTestCase):
"""Passing unshare_pid in as True and no command should raise."""
self.mock_has_unshare_pid.return_value = False
expected_msg = 'no unshare command'
- with self.assertRaisesRegexp(RuntimeError, expected_msg):
+ with self.assertRaisesRegex(RuntimeError, expected_msg):
util._get_unshare_pid_args(True)
- with self.assertRaisesRegexp(RuntimeError, expected_msg):
+ with self.assertRaisesRegex(RuntimeError, expected_msg):
util._get_unshare_pid_args(True, "/foo", 0)
def test_unshare_pid_true_and_not_root_raises(self):
"""When unshare_pid is True for non-root an error is raised."""
expected_msg = 'euid.* != 0'
- with self.assertRaisesRegexp(RuntimeError, expected_msg):
+ with self.assertRaisesRegex(RuntimeError, expected_msg):
util._get_unshare_pid_args(True, "/foo", 500)
self.mock_geteuid.return_value = 500
- with self.assertRaisesRegexp(RuntimeError, expected_msg):
+ with self.assertRaisesRegex(RuntimeError, expected_msg):
util._get_unshare_pid_args(True)
def test_euid0_target_not_slash(self):
diff --git a/tests/vmtests/test_basic.py b/tests/vmtests/test_basic.py
index e0eb391..f9c3b04 100644
--- a/tests/vmtests/test_basic.py
+++ b/tests/vmtests/test_basic.py
@@ -67,7 +67,7 @@ class TestBasicAbs(VMBaseClass):
self.output_files_exist([blkid_output])
blkid_info = self.get_blkid_data(blkid_output)
- self.assertEquals(expected, blkid_info["PTTYPE"])
+ self.assertEqual(expected, blkid_info["PTTYPE"])
@skip_if_flag('expected_failure')
def _test_partition_numbers(self, disk, expected):
diff --git a/tests/vmtests/test_zfsroot.py b/tests/vmtests/test_zfsroot.py
index 1ea6ca0..6b4209d 100644
--- a/tests/vmtests/test_zfsroot.py
+++ b/tests/vmtests/test_zfsroot.py
@@ -34,7 +34,7 @@ class TestZfsRootAbs(VMBaseClass):
def test_ptable(self):
self.output_files_exist(["blkid_output_vda"])
blkid_info = self.get_blkid_data("blkid_output_vda")
- self.assertEquals(blkid_info["PTTYPE"], "gpt")
+ self.assertEqual(blkid_info["PTTYPE"], "gpt")
@skip_if_flag('expected_failure')
def test_zfs_list(self):
Follow ups
