virt root tests: replace assertEquals with assertEqual

assertEquals will be deprecated in Python 3.

This is part of blueprint assertequal

Change-Id: I635ba12a553c33cf962dac22bd38bfcb51ca6f61
This commit is contained in:
Gary Kotton
2013-11-11 04:49:34 -08:00
parent 9c5b9762a3
commit 3738ccc854
8 changed files with 132 additions and 132 deletions

View File

@@ -46,13 +46,13 @@ class LoopTestCase(test.NoDBTestCase):
# No error logged, device consumed
self.assertTrue(l.get_dev())
self.assertTrue(l.linked)
self.assertEquals('', l.error)
self.assertEquals('/dev/loop0', l.device)
self.assertEqual('', l.error)
self.assertEqual('/dev/loop0', l.device)
# Free
l.unget_dev()
self.assertFalse(l.linked)
self.assertEquals('', l.error)
self.assertEqual('', l.error)
self.assertIsNone(l.device)
def test_inner_get_dev_fails(self):
@@ -64,7 +64,7 @@ class LoopTestCase(test.NoDBTestCase):
# No error logged, device consumed
self.assertFalse(l._inner_get_dev())
self.assertFalse(l.linked)
self.assertNotEquals('', l.error)
self.assertNotEqual('', l.error)
self.assertIsNone(l.device)
# Free

View File

@@ -99,7 +99,7 @@ class NbdTestCase(test.NoDBTestCase):
# TODO(mikal): work out how to force english as the gettext language
# so that the error check always passes
self.assertIsNone(n._allocate_nbd())
self.assertEquals('nbd unavailable: module not loaded', n.error)
self.assertEqual('nbd unavailable: module not loaded', n.error)
def test_nbd_allocation(self):
tempdir = self.useFixture(fixtures.TempDir()).path
@@ -109,7 +109,7 @@ class NbdTestCase(test.NoDBTestCase):
self.useFixture(fixtures.MonkeyPatch('random.shuffle', _fake_noop))
# Allocate a nbd device
self.assertEquals('/dev/nbd0', n._allocate_nbd())
self.assertEqual('/dev/nbd0', n._allocate_nbd())
def test_nbd_allocation_one_in_use(self):
tempdir = self.useFixture(fixtures.TempDir()).path
@@ -131,7 +131,7 @@ class NbdTestCase(test.NoDBTestCase):
# TODO(mikal): Note that there is a leak here, as the in use nbd device
# is removed from the list, but not returned so it will never be
# re-added. I will fix this in a later patch.
self.assertEquals('/dev/nbd1', n._allocate_nbd())
self.assertEqual('/dev/nbd1', n._allocate_nbd())
def test_inner_get_dev_no_devices(self):
tempdir = self.useFixture(fixtures.TempDir()).path
@@ -208,13 +208,13 @@ class NbdTestCase(test.NoDBTestCase):
# No error logged, device consumed
self.assertTrue(n._inner_get_dev())
self.assertTrue(n.linked)
self.assertEquals('', n.error)
self.assertEquals('/dev/nbd0', n.device)
self.assertEqual('', n.error)
self.assertEqual('/dev/nbd0', n.device)
# Free
n.unget_dev()
self.assertFalse(n.linked)
self.assertEquals('', n.error)
self.assertEqual('', n.error)
self.assertIsNone(n.device)
def test_unget_dev_simple(self):
@@ -238,13 +238,13 @@ class NbdTestCase(test.NoDBTestCase):
# No error logged, device consumed
self.assertTrue(n.get_dev())
self.assertTrue(n.linked)
self.assertEquals('', n.error)
self.assertEquals('/dev/nbd0', n.device)
self.assertEqual('', n.error)
self.assertEqual('/dev/nbd0', n.device)
# Free
n.unget_dev()
self.assertFalse(n.linked)
self.assertEquals('', n.error)
self.assertEqual('', n.error)
self.assertIsNone(n.device)
def test_get_dev_timeout(self):

View File

@@ -185,7 +185,7 @@ class TestDriverBlockDevice(test.NoDBTestCase):
self.assertTrue(self.base_class_transform_called)
self.assertThat(dummy_device, matchers.DictMatches(
{'foo': None, 'bar': None}))
self.assertEquals(dummy_device.id, 42)
self.assertEqual(dummy_device.id, 42)
self.assertThat(dummy_device.legacy(), matchers.DictMatches(
{'foo': None, 'baz': None}))
@@ -238,28 +238,28 @@ class TestDriverBlockDevice(test.NoDBTestCase):
test_bdm = self.driver_classes['volume'](
self.volume_bdm)
self.assertEquals(test_bdm.id, 3)
self.assertEquals(test_bdm.volume_id, 'fake-volume-id-1')
self.assertEquals(test_bdm.volume_size, 8)
self.assertEqual(test_bdm.id, 3)
self.assertEqual(test_bdm.volume_id, 'fake-volume-id-1')
self.assertEqual(test_bdm.volume_size, 8)
def test_driver_snapshot_block_device(self):
self._test_driver_device("snapshot")
test_bdm = self.driver_classes['snapshot'](
self.snapshot_bdm)
self.assertEquals(test_bdm.id, 4)
self.assertEquals(test_bdm.snapshot_id, 'fake-snapshot-id-1')
self.assertEquals(test_bdm.volume_id, 'fake-volume-id-2')
self.assertEquals(test_bdm.volume_size, 3)
self.assertEqual(test_bdm.id, 4)
self.assertEqual(test_bdm.snapshot_id, 'fake-snapshot-id-1')
self.assertEqual(test_bdm.volume_id, 'fake-volume-id-2')
self.assertEqual(test_bdm.volume_size, 3)
def test_driver_image_block_device(self):
self._test_driver_device('image')
test_bdm = self.driver_classes['image'](
self.image_bdm)
self.assertEquals(test_bdm.id, 5)
self.assertEquals(test_bdm.image_id, 'fake-image-id-1')
self.assertEquals(test_bdm.volume_size, 1)
self.assertEqual(test_bdm.id, 5)
self.assertEqual(test_bdm.image_id, 'fake-image-id-1')
self.assertEqual(test_bdm.volume_size, 1)
def test_driver_image_block_device_destination_local(self):
self._test_driver_device('image')
@@ -354,7 +354,7 @@ class TestDriverBlockDevice(test.NoDBTestCase):
test_bdm.attach(self.context, instance, self.volume_api,
self.virt_driver, self.db_api, wait_func)
self.assertEquals(test_bdm.volume_id, 'fake-volume-id-2')
self.assertEqual(test_bdm.volume_id, 'fake-volume-id-2')
def test_snapshot_attach_volume(self):
test_bdm = self.driver_classes['snapshot'](
@@ -377,7 +377,7 @@ class TestDriverBlockDevice(test.NoDBTestCase):
test_bdm.attach(self.context, instance, self.volume_api,
self.virt_driver, self.db_api)
self.assertEquals(test_bdm.volume_id, 'fake-volume-id-2')
self.assertEqual(test_bdm.volume_id, 'fake-volume-id-2')
def test_image_attach_no_volume(self):
no_volume_image = self.image_bdm.copy()
@@ -404,7 +404,7 @@ class TestDriverBlockDevice(test.NoDBTestCase):
test_bdm.attach(self.context, instance, self.volume_api,
self.virt_driver, self.db_api, wait_func)
self.assertEquals(test_bdm.volume_id, 'fake-volume-id-2')
self.assertEqual(test_bdm.volume_id, 'fake-volume-id-2')
def test_image_attach_volume(self):
test_bdm = self.driver_classes['image'](
@@ -427,13 +427,13 @@ class TestDriverBlockDevice(test.NoDBTestCase):
test_bdm.attach(self.context, instance, self.volume_api,
self.virt_driver, self.db_api)
self.assertEquals(test_bdm.volume_id, 'fake-volume-id-2')
self.assertEqual(test_bdm.volume_id, 'fake-volume-id-2')
def test_convert_block_devices(self):
converted = driver_block_device._convert_block_devices(
self.driver_classes['volume'],
[self.volume_bdm, self.ephemeral_bdm])
self.assertEquals(converted, [self.volume_driver_bdm])
self.assertEqual(converted, [self.volume_driver_bdm])
def test_legacy_block_devices(self):
test_snapshot = self.driver_classes['snapshot'](
@@ -442,7 +442,7 @@ class TestDriverBlockDevice(test.NoDBTestCase):
block_device_mapping = [test_snapshot, test_snapshot]
legacy_bdm = driver_block_device.legacy_block_devices(
block_device_mapping)
self.assertEquals(legacy_bdm, [self.snapshot_legacy_driver_bdm,
self.assertEqual(legacy_bdm, [self.snapshot_legacy_driver_bdm,
self.snapshot_legacy_driver_bdm])
# Test that the ephemerals work as expected
@@ -456,17 +456,17 @@ class TestDriverBlockDevice(test.NoDBTestCase):
expected[1]['num'] = 1
legacy_ephemerals = driver_block_device.legacy_block_devices(
test_ephemerals)
self.assertEquals(expected, legacy_ephemerals)
self.assertEqual(expected, legacy_ephemerals)
def test_get_swap(self):
swap = [self.swap_driver_bdm]
legacy_swap = [self.swap_legacy_driver_bdm]
no_swap = [self.volume_driver_bdm]
self.assertEquals(swap[0], driver_block_device.get_swap(swap))
self.assertEquals(legacy_swap[0],
self.assertEqual(swap[0], driver_block_device.get_swap(swap))
self.assertEqual(legacy_swap[0],
driver_block_device.get_swap(legacy_swap))
self.assertEquals(no_swap, driver_block_device.get_swap(no_swap))
self.assertEqual(no_swap, driver_block_device.get_swap(no_swap))
self.assertIsNone(driver_block_device.get_swap([]))
def test_is_implemented(self):

View File

@@ -32,9 +32,9 @@ class FakeDriver2(FakeDriver):
class ToDriverRegistryTestCase(test.NoDBTestCase):
def assertDriverInstance(self, inst, class_, *args, **kwargs):
self.assertEquals(class_, inst.__class__)
self.assertEquals(args, inst.args)
self.assertEquals(kwargs, inst.kwargs)
self.assertEqual(class_, inst.__class__)
self.assertEqual(args, inst.args)
self.assertEqual(kwargs, inst.kwargs)
def test_driver_dict_from_config(self):
drvs = driver.driver_dict_from_config(
@@ -44,7 +44,7 @@ class ToDriverRegistryTestCase(test.NoDBTestCase):
], 'arg1', 'arg2', param1='value1', param2='value2'
)
self.assertEquals(
self.assertEqual(
sorted(['key1', 'key2']),
sorted(drvs.keys())
)

View File

@@ -76,16 +76,16 @@ class VirtDiskTest(test.NoDBTestCase):
diskapi._inject_key_into_fs("mysshkey", vfs)
self.assertIn("/root/.ssh", vfs.handle.files)
self.assertEquals(vfs.handle.files["/root/.ssh"],
self.assertEqual(vfs.handle.files["/root/.ssh"],
{'isdir': True, 'gid': 0, 'uid': 0, 'mode': 0o700})
self.assertIn("/root/.ssh/authorized_keys", vfs.handle.files)
self.assertEquals(vfs.handle.files["/root/.ssh/authorized_keys"],
{'isdir': False,
'content': "Hello World\n# The following ssh " +
"key was injected by Nova\nmysshkey\n",
'gid': 100,
'uid': 100,
'mode': 0o600})
self.assertEqual(vfs.handle.files["/root/.ssh/authorized_keys"],
{'isdir': False,
'content': "Hello World\n# The following ssh " +
"key was injected by Nova\nmysshkey\n",
'gid': 100,
'uid': 100,
'mode': 0o600})
vfs.teardown()
@@ -99,27 +99,27 @@ class VirtDiskTest(test.NoDBTestCase):
diskapi._inject_key_into_fs("mysshkey", vfs)
self.assertIn("/etc/rc.d/rc.local", vfs.handle.files)
self.assertEquals(vfs.handle.files["/etc/rc.d/rc.local"],
{'isdir': False,
'content': "Hello World#!/bin/sh\n# Added by " +
"Nova to ensure injected ssh keys " +
"have the right context\nrestorecon " +
"-RF root/.ssh 2>/dev/null || :\n",
'gid': 100,
'uid': 100,
'mode': 0o700})
self.assertEqual(vfs.handle.files["/etc/rc.d/rc.local"],
{'isdir': False,
'content': "Hello World#!/bin/sh\n# Added by " +
"Nova to ensure injected ssh keys " +
"have the right context\nrestorecon " +
"-RF root/.ssh 2>/dev/null || :\n",
'gid': 100,
'uid': 100,
'mode': 0o700})
self.assertIn("/root/.ssh", vfs.handle.files)
self.assertEquals(vfs.handle.files["/root/.ssh"],
{'isdir': True, 'gid': 0, 'uid': 0, 'mode': 0o700})
self.assertEqual(vfs.handle.files["/root/.ssh"],
{'isdir': True, 'gid': 0, 'uid': 0, 'mode': 0o700})
self.assertIn("/root/.ssh/authorized_keys", vfs.handle.files)
self.assertEquals(vfs.handle.files["/root/.ssh/authorized_keys"],
{'isdir': False,
'content': "Hello World\n# The following ssh " +
"key was injected by Nova\nmysshkey\n",
'gid': 100,
'uid': 100,
'mode': 0o600})
self.assertEqual(vfs.handle.files["/root/.ssh/authorized_keys"],
{'isdir': False,
'content': "Hello World\n# The following ssh " +
"key was injected by Nova\nmysshkey\n",
'gid': 100,
'uid': 100,
'mode': 0o600})
vfs.teardown()
@@ -134,7 +134,7 @@ class VirtDiskTest(test.NoDBTestCase):
diskapi._inject_key_into_fs("mysshkey", vfs)
self.assertIn("/etc/rc.d/rc.local", vfs.handle.files)
self.assertEquals(vfs.handle.files["/etc/rc.d/rc.local"],
self.assertEqual(vfs.handle.files["/etc/rc.d/rc.local"],
{'isdir': False,
'content': "#!/bin/sh\necho done\n# Added "
"by Nova to ensure injected ssh keys have "
@@ -153,12 +153,12 @@ class VirtDiskTest(test.NoDBTestCase):
diskapi._inject_net_into_fs("mynetconfig", vfs)
self.assertIn("/etc/network/interfaces", vfs.handle.files)
self.assertEquals(vfs.handle.files["/etc/network/interfaces"],
{'content': 'mynetconfig',
'gid': 100,
'isdir': False,
'mode': 0o700,
'uid': 100})
self.assertEqual(vfs.handle.files["/etc/network/interfaces"],
{'content': 'mynetconfig',
'gid': 100,
'isdir': False,
'mode': 0o700,
'uid': 100})
vfs.teardown()
def test_inject_metadata(self):
@@ -171,13 +171,13 @@ class VirtDiskTest(test.NoDBTestCase):
"value": "wizz"}], vfs)
self.assertIn("/meta.js", vfs.handle.files)
self.assertEquals(vfs.handle.files["/meta.js"],
{'content': '{"foo": "bar", ' +
'"eek": "wizz"}',
'gid': 100,
'isdir': False,
'mode': 0o700,
'uid': 100})
self.assertEqual(vfs.handle.files["/meta.js"],
{'content': '{"foo": "bar", ' +
'"eek": "wizz"}',
'gid': 100,
'isdir': False,
'mode': 0o700,
'uid': 100})
vfs.teardown()
def test_inject_admin_password(self):
@@ -201,37 +201,37 @@ class VirtDiskTest(test.NoDBTestCase):
diskapi._inject_admin_password_into_fs("123456", vfs)
self.assertEquals(vfs.handle.files["/etc/passwd"],
{'content': "root:x:0:0:root:/root:/bin/bash\n" +
"bin:x:1:1:bin:/bin:/sbin/nologin\n" +
"daemon:x:2:2:daemon:/sbin:" +
"/sbin/nologin\n",
'gid': 100,
'isdir': False,
'mode': 0o700,
'uid': 100})
self.assertEqual(vfs.handle.files["/etc/passwd"],
{'content': "root:x:0:0:root:/root:/bin/bash\n" +
"bin:x:1:1:bin:/bin:/sbin/nologin\n" +
"daemon:x:2:2:daemon:/sbin:" +
"/sbin/nologin\n",
'gid': 100,
'isdir': False,
'mode': 0o700,
'uid': 100})
shadow = vfs.handle.files["/etc/shadow"]
# if the encrypted password is only 13 characters long, then
# nova.virt.disk.api:_set_password fell back to DES.
if len(shadow['content']) == 91:
self.assertEquals(shadow,
{'content': "root:12tir.zIbWQ3c" +
":14917:0:99999:7:::\n" +
"bin:*:14495:0:99999:7:::\n" +
"daemon:*:14495:0:99999:7:::\n",
'gid': 100,
'isdir': False,
'mode': 0o700,
'uid': 100})
self.assertEqual(shadow,
{'content': "root:12tir.zIbWQ3c" +
":14917:0:99999:7:::\n" +
"bin:*:14495:0:99999:7:::\n" +
"daemon:*:14495:0:99999:7:::\n",
'gid': 100,
'isdir': False,
'mode': 0o700,
'uid': 100})
else:
self.assertEquals(shadow,
{'content': "root:$1$12345678$a4ge4d5iJ5vw" +
"vbFS88TEN0:14917:0:99999:7:::\n" +
"bin:*:14495:0:99999:7:::\n" +
"daemon:*:14495:0:99999:7:::\n",
'gid': 100,
'isdir': False,
'mode': 0o700,
'uid': 100})
self.assertEqual(shadow,
{'content': "root:$1$12345678$a4ge4d5iJ5vw" +
"vbFS88TEN0:14917:0:99999:7:::\n" +
"bin:*:14495:0:99999:7:::\n" +
"daemon:*:14495:0:99999:7:::\n",
'gid': 100,
'isdir': False,
'mode': 0o700,
'uid': 100})
vfs.teardown()

View File

@@ -176,10 +176,10 @@ class VirtDiskVFSGuestFSTest(test.NoDBTestCase):
vfs.setup()
vfs.read_file("/some/file")
self.assertEquals(vfs.handle.files["/some/file"]["mode"], 0o700)
self.assertEqual(vfs.handle.files["/some/file"]["mode"], 0o700)
vfs.set_permissions("/some/file", 0o7777)
self.assertEquals(vfs.handle.files["/some/file"]["mode"], 0o7777)
self.assertEqual(vfs.handle.files["/some/file"]["mode"], 0o7777)
vfs.teardown()
@@ -188,19 +188,19 @@ class VirtDiskVFSGuestFSTest(test.NoDBTestCase):
vfs.setup()
vfs.read_file("/some/file")
self.assertEquals(vfs.handle.files["/some/file"]["uid"], 100)
self.assertEquals(vfs.handle.files["/some/file"]["gid"], 100)
self.assertEqual(vfs.handle.files["/some/file"]["uid"], 100)
self.assertEqual(vfs.handle.files["/some/file"]["gid"], 100)
vfs.set_ownership("/some/file", "fred", None)
self.assertEquals(vfs.handle.files["/some/file"]["uid"], 105)
self.assertEquals(vfs.handle.files["/some/file"]["gid"], 100)
self.assertEqual(vfs.handle.files["/some/file"]["uid"], 105)
self.assertEqual(vfs.handle.files["/some/file"]["gid"], 100)
vfs.set_ownership("/some/file", None, "users")
self.assertEquals(vfs.handle.files["/some/file"]["uid"], 105)
self.assertEquals(vfs.handle.files["/some/file"]["gid"], 500)
self.assertEqual(vfs.handle.files["/some/file"]["uid"], 105)
self.assertEqual(vfs.handle.files["/some/file"]["gid"], 500)
vfs.set_ownership("/some/file", "joe", "admins")
self.assertEquals(vfs.handle.files["/some/file"]["uid"], 110)
self.assertEquals(vfs.handle.files["/some/file"]["gid"], 600)
self.assertEqual(vfs.handle.files["/some/file"]["uid"], 110)
self.assertEqual(vfs.handle.files["/some/file"]["gid"], 600)
vfs.teardown()

View File

@@ -140,7 +140,7 @@ class VirtDiskVFSLocalFSTestPaths(test.NoDBTestCase):
vfs = vfsimpl.VFSLocalFS("dummy.img")
vfs.imgdir = "/foo"
ret = vfs._canonical_path('etc/something.conf')
self.assertEquals(ret, '/foo/etc/something.conf')
self.assertEqual(ret, '/foo/etc/something.conf')
def test_check_unsafe_path(self):
if tests_utils.is_osx():
@@ -197,8 +197,8 @@ class VirtDiskVFSLocalFSTest(test.NoDBTestCase):
vfs.append_file("/some/file", " Goodbye")
self.assertIn("/scratch/dir/some/file", files)
self.assertEquals(files["/scratch/dir/some/file"]["content"],
"Hello World Goodbye")
self.assertEqual(files["/scratch/dir/some/file"]["content"],
"Hello World Goodbye")
root_helper = nova.utils._get_root_helper()
self.assertEqual(commands,
@@ -223,8 +223,8 @@ class VirtDiskVFSLocalFSTest(test.NoDBTestCase):
vfs.replace_file("/some/file", "Goodbye")
self.assertIn("/scratch/dir/some/file", files)
self.assertEquals(files["/scratch/dir/some/file"]["content"],
"Goodbye")
self.assertEqual(files["/scratch/dir/some/file"]["content"],
"Goodbye")
root_helper = nova.utils._get_root_helper()
self.assertEqual(commands,
@@ -308,7 +308,7 @@ class VirtDiskVFSLocalFSTest(test.NoDBTestCase):
vfs.read_file("/some/file")
vfs.set_permissions("/some/file", 0o777)
self.assertEquals(files["/scratch/dir/some/file"]["mode"], 0o777)
self.assertEqual(files["/scratch/dir/some/file"]["mode"], 0o777)
root_helper = nova.utils._get_root_helper()
self.assertEqual(commands,
@@ -338,20 +338,20 @@ class VirtDiskVFSLocalFSTest(test.NoDBTestCase):
vfs.imgdir = "/scratch/dir"
vfs.read_file("/some/file")
self.assertEquals(files["/scratch/dir/some/file"]["uid"], 100)
self.assertEquals(files["/scratch/dir/some/file"]["gid"], 100)
self.assertEqual(files["/scratch/dir/some/file"]["uid"], 100)
self.assertEqual(files["/scratch/dir/some/file"]["gid"], 100)
vfs.set_ownership("/some/file", "fred", None)
self.assertEquals(files["/scratch/dir/some/file"]["uid"], 105)
self.assertEquals(files["/scratch/dir/some/file"]["gid"], 100)
self.assertEqual(files["/scratch/dir/some/file"]["uid"], 105)
self.assertEqual(files["/scratch/dir/some/file"]["gid"], 100)
vfs.set_ownership("/some/file", None, "users")
self.assertEquals(files["/scratch/dir/some/file"]["uid"], 105)
self.assertEquals(files["/scratch/dir/some/file"]["gid"], 500)
self.assertEqual(files["/scratch/dir/some/file"]["uid"], 105)
self.assertEqual(files["/scratch/dir/some/file"]["gid"], 500)
vfs.set_ownership("/some/file", "joe", "admins")
self.assertEquals(files["/scratch/dir/some/file"]["uid"], 110)
self.assertEquals(files["/scratch/dir/some/file"]["gid"], 600)
self.assertEqual(files["/scratch/dir/some/file"]["uid"], 110)
self.assertEqual(files["/scratch/dir/some/file"]["gid"], 600)
root_helper = nova.utils._get_root_helper()
self.assertEqual(commands,

View File

@@ -266,7 +266,7 @@ class _VirtDriverTestCase(_FakeDriverBackendTestCase):
ip = netaddr.IPAddress(host_ip)
# For now, assume IPv4.
self.assertEquals(ip.version, 4)
self.assertEqual(ip.version, 4)
@catch_notimplementederror
def test_set_admin_password(self):
@@ -483,13 +483,13 @@ class _VirtDriverTestCase(_FakeDriverBackendTestCase):
def test_block_stats(self):
instance_ref, network_info = self._get_running_instance()
stats = self.connection.block_stats(instance_ref['name'], 'someid')
self.assertEquals(len(stats), 5)
self.assertEqual(len(stats), 5)
@catch_notimplementederror
def test_interface_stats(self):
instance_ref, network_info = self._get_running_instance()
stats = self.connection.interface_stats(instance_ref['name'], 'someid')
self.assertEquals(len(stats), 8)
self.assertEqual(len(stats), 8)
@catch_notimplementederror
def test_get_console_output(self):