openstack
/
python-novaclient
Code Issues Proposed changes

Fix order of arguments in assertEquals 

Part 10

Related to: bug #1277104

Change-Id: I582cfcf88def00c6c885ab78f26f2b4fa30c4457
This commit is contained in:
liaonanhai 2014-08-04 10:13:54 +08:00
parent aae7ca2f9b
commit 9561e620e2
23 changed files with 142 additions and 142 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
novaclient/tests/test_auth_plugins.py
View File

@ -172,7 +172,7 @@ class DeprecatedAuthPluginTest(utils.TestCase):
auth_system="fakewithauthurl",
auth_plugin=plugin)
cs.client.authenticate()
self.assertEqual(cs.client.auth_url, "http://faked/v2.0")
self.assertEqual("http://faked/v2.0", cs.client.auth_url)
test_auth_call()
@ -302,7 +302,7 @@ class AuthPluginTest(utils.TestCase):
cs = client.Client("username", "password", "project_id",
auth_system="fakewithauthurl",
auth_plugin=plugin)
self.assertEqual(cs.client.auth_url, "http://faked/v2.0")
self.assertEqual("http://faked/v2.0", cs.client.auth_url)
@mock.patch.object(pkg_resources, "iter_entry_points")
def test_exception_if_no_authenticate(self, mock_iter_entry_points):

8
novaclient/tests/test_base.py
View File

@ -25,18 +25,18 @@ class BaseTest(utils.TestCase):
def test_resource_repr(self):
r = base.Resource(None, dict(foo="bar", baz="spam"))
self.assertEqual(repr(r), "<Resource baz=spam, foo=bar>")
self.assertEqual("<Resource baz=spam, foo=bar>", repr(r))
def test_getid(self):
self.assertEqual(base.getid(4), 4)
self.assertEqual(4, base.getid(4))
class TmpObject(object):
id = 4
self.assertEqual(base.getid(TmpObject), 4)
self.assertEqual(4, base.getid(TmpObject))
def test_resource_lazy_getattr(self):
f = flavors.Flavor(cs.flavors, {'id': 1})
self.assertEqual(f.name, '256 MB Server')
self.assertEqual('256 MB Server', f.name)
cs.assert_called('GET', '/flavors/1')
# Missing stuff still fails after a second get

18
novaclient/tests/test_client.py
View File

@ -47,7 +47,7 @@ class ClientTest(utils.TestCase):
projectid='project',
timeout=2,
auth_url="http://www.blah.com")
self.assertEqual(instance.timeout, 2)
self.assertEqual(2, instance.timeout)
mock_request = mock.Mock()
mock_request.return_value = requests.Response()
mock_request.return_value.status_code = 200
@ -106,7 +106,7 @@ class ClientTest(utils.TestCase):
allow_redirects=mock.ANY,
data=json.dumps(data),
verify=mock.ANY)]
self.assertEqual(mock_request.call_args_list, expected)
self.assertEqual(expected, mock_request.call_args_list)
@mock.patch.object(novaclient.client.HTTPClient, 'request',
return_value=(200, "{'versions':[]}"))
@ -263,7 +263,7 @@ class ClientTest(utils.TestCase):
def test_get_password_simple(self):
cs = novaclient.client.HTTPClient("user", "password", "", "")
cs.password_func = mock.Mock()
self.assertEqual(cs._get_password(), "password")
self.assertEqual("password", cs._get_password())
self.assertFalse(cs.password_func.called)
def test_get_password_none(self):
@ -273,26 +273,26 @@ class ClientTest(utils.TestCase):
def test_get_password_func(self):
cs = novaclient.client.HTTPClient("user", None, "", "")
cs.password_func = mock.Mock(return_value="password")
self.assertEqual(cs._get_password(), "password")
self.assertEqual("password", cs._get_password())
cs.password_func.assert_called_once_with()
cs.password_func = mock.Mock()
self.assertEqual(cs._get_password(), "password")
self.assertEqual("password", cs._get_password())
self.assertFalse(cs.password_func.called)
def test_auth_url_rstrip_slash(self):
cs = novaclient.client.HTTPClient("user", "password", "project_id",
auth_url="foo/v2/")
self.assertEqual(cs.auth_url, "foo/v2")
self.assertEqual("foo/v2", cs.auth_url)
def test_token_and_bypass_url(self):
cs = novaclient.client.HTTPClient(None, None, None,
auth_token="12345",
bypass_url="compute/v100/")
self.assertIsNone(cs.auth_url)
self.assertEqual(cs.auth_token, "12345")
self.assertEqual(cs.bypass_url, "compute/v100")
self.assertEqual(cs.management_url, "compute/v100")
self.assertEqual("12345", cs.auth_token)
self.assertEqual("compute/v100", cs.bypass_url)
self.assertEqual("compute/v100", cs.management_url)
@mock.patch("novaclient.client.requests.Session")
def test_session(self, mock_session):

4
novaclient/tests/test_discover.py
View File

@ -40,7 +40,7 @@ class DiscoverTest(utils.TestCase):
def test():
shell = novaclient.shell.OpenStackComputeShell()
for name, module in shell._discover_via_entry_points():
self.assertEqual(name, 'foo')
self.assertEqual('foo', name)
self.assertTrue(inspect.ismodule(module))
test()
@ -68,7 +68,7 @@ class DiscoverTest(utils.TestCase):
def test():
shell = novaclient.shell.OpenStackComputeShell()
extensions = shell._discover_extensions('1.1')
self.assertEqual(len(extensions), 3)
self.assertEqual(3, len(extensions))
names = sorted(['foo', 'bar', 'baz'])
sorted_extensions = sorted(extensions, key=lambda ext: ext.name)
for i in range(len(names)):

6
novaclient/tests/test_http.py
View File

@ -79,7 +79,7 @@ class ClientTest(utils.TestCase):
headers=headers,
**self.TEST_REQUEST_BASE)
# Automatic JSON parsing
self.assertEqual(body, {"hi": "there"})
self.assertEqual({"hi": "there"}, body)
test_get_call()
@ -136,11 +136,11 @@ class ClientTest(utils.TestCase):
def test_client_logger(self):
cl1 = client.HTTPClient("username", "password", "project_id",
"auth_test", http_log_debug=True)
self.assertEqual(len(cl1._logger.handlers), 1)
self.assertEqual(1, len(cl1._logger.handlers))
cl2 = client.HTTPClient("username", "password", "project_id",
"auth_test", http_log_debug=True)
self.assertEqual(len(cl2._logger.handlers), 1)
self.assertEqual(1, len(cl2._logger.handlers))
@mock.patch.object(requests, 'request', unknown_error_mock_request)
def test_unknown_server_error(self):

16
novaclient/tests/test_service_catalog.py
View File

@ -129,10 +129,10 @@ class ServiceCatalogTest(utils.TestCase):
self.assertRaises(exceptions.AmbiguousEndpoints, sc.url_for,
service_type='compute')
self.assertEqual(sc.url_for('tenantId', '1', service_type='compute'),
"https://compute1.host/v2/1")
self.assertEqual(sc.url_for('tenantId', '2', service_type='compute'),
"https://compute1.host/v1.1/2")
self.assertEqual("https://compute1.host/v2/1",
sc.url_for('tenantId', '1', service_type='compute'))
self.assertEqual("https://compute1.host/v1.1/2",
sc.url_for('tenantId', '2', service_type='compute'))
self.assertRaises(exceptions.EndpointNotFound, sc.url_for,
"region", "South", service_type='compute')
@ -148,10 +148,10 @@ class ServiceCatalogTest(utils.TestCase):
self.assertRaises(exceptions.AmbiguousEndpoints, sc.url_for,
service_type='volume')
self.assertEqual(sc.url_for('tenantId', '1', service_type='volume'),
"https://volume1.host/v1/1")
self.assertEqual(sc.url_for('tenantId', '2', service_type='volume'),
"https://volume1.host/v1.1/2")
self.assertEqual("https://volume1.host/v1/1",
sc.url_for('tenantId', '1', service_type='volume'))
self.assertEqual("https://volume1.host/v1.1/2",
sc.url_for('tenantId', '2', service_type='volume'))
self.assertRaises(exceptions.EndpointNotFound, sc.url_for,
"region", "North", service_type='volume')

56
novaclient/tests/test_utils.py
View File

@ -140,26 +140,26 @@ class PrintResultTestCase(test_utils.TestCase):
def test_print_dict(self):
dict = {'key': 'value'}
utils.print_dict(dict)
self.assertEqual(sys.stdout.getvalue(),
'+----------+-------+\n'
self.assertEqual('+----------+-------+\n'
'| Property | Value |\n'
'+----------+-------+\n'
'| key | value |\n'
'+----------+-------+\n')
'+----------+-------+\n',
sys.stdout.getvalue())
@mock.patch('sys.stdout', six.StringIO())
def test_print_dict_wrap(self):
dict = {'key1': 'not wrapped',
'key2': 'this will be wrapped'}
utils.print_dict(dict, wrap=16)
self.assertEqual(sys.stdout.getvalue(),
'+----------+--------------+\n'
self.assertEqual('+----------+--------------+\n'
'| Property | Value |\n'
'+----------+--------------+\n'
'| key1 | not wrapped |\n'
'| key2 | this will be |\n'
'| | wrapped |\n'
'+----------+--------------+\n')
'+----------+--------------+\n',
sys.stdout.getvalue())
@mock.patch('sys.stdout', six.StringIO())
def test_print_list_sort_by_str(self):
@ -169,14 +169,14 @@ class PrintResultTestCase(test_utils.TestCase):
utils.print_list(objs, ["Name", "Value"], sortby_index=0)
self.assertEqual(sys.stdout.getvalue(),
'+------+-------+\n'
self.assertEqual('+------+-------+\n'
'| Name | Value |\n'
'+------+-------+\n'
'| k1 | 1 |\n'
'| k2 | 3 |\n'
'| k3 | 2 |\n'
'+------+-------+\n')
'+------+-------+\n',
sys.stdout.getvalue())
@mock.patch('sys.stdout', six.StringIO())
def test_print_list_sort_by_integer(self):
@ -186,14 +186,14 @@ class PrintResultTestCase(test_utils.TestCase):
utils.print_list(objs, ["Name", "Value"], sortby_index=1)
self.assertEqual(sys.stdout.getvalue(),
'+------+-------+\n'
self.assertEqual('+------+-------+\n'
'| Name | Value |\n'
'+------+-------+\n'
'| k1 | 1 |\n'
'| k3 | 2 |\n'
'| k2 | 3 |\n'
'+------+-------+\n')
'+------+-------+\n',
sys.stdout.getvalue())
# without sorting
@mock.patch('sys.stdout', six.StringIO())
@ -204,47 +204,47 @@ class PrintResultTestCase(test_utils.TestCase):
utils.print_list(objs, ["Name", "Value"], sortby_index=None)
self.assertEqual(sys.stdout.getvalue(),
'+------+-------+\n'
self.assertEqual('+------+-------+\n'
'| Name | Value |\n'
'+------+-------+\n'
'| k1 | 1 |\n'
'| k3 | 3 |\n'
'| k2 | 2 |\n'
'+------+-------+\n')
'+------+-------+\n',
sys.stdout.getvalue())
@mock.patch('sys.stdout', six.StringIO())
def test_print_dict_dictionary(self):
dict = {'k': {'foo': 'bar'}}
utils.print_dict(dict)
self.assertEqual(sys.stdout.getvalue(),
'+----------+----------------+\n'
self.assertEqual('+----------+----------------+\n'
'| Property | Value |\n'
'+----------+----------------+\n'
'| k | {"foo": "bar"} |\n'
'+----------+----------------+\n')
'+----------+----------------+\n',
sys.stdout.getvalue())
@mock.patch('sys.stdout', six.StringIO())
def test_print_dict_list_dictionary(self):
dict = {'k': [{'foo': 'bar'}]}
utils.print_dict(dict)
self.assertEqual(sys.stdout.getvalue(),
'+----------+------------------+\n'
self.assertEqual('+----------+------------------+\n'
'| Property | Value |\n'
'+----------+------------------+\n'
'| k | [{"foo": "bar"}] |\n'
'+----------+------------------+\n')
'+----------+------------------+\n',
sys.stdout.getvalue())
@mock.patch('sys.stdout', six.StringIO())
def test_print_dict_list(self):
dict = {'k': ['foo', 'bar']}
utils.print_dict(dict)
self.assertEqual(sys.stdout.getvalue(),
'+----------+----------------+\n'
self.assertEqual('+----------+----------------+\n'
'| Property | Value |\n'
'+----------+----------------+\n'
'| k | ["foo", "bar"] |\n'
'+----------+----------------+\n')
'+----------+----------------+\n',
sys.stdout.getvalue())
class FlattenTestCase(test_utils.TestCase):
@ -270,22 +270,22 @@ class FlattenTestCase(test_utils.TestCase):
def test_pretty_choice_list(self):
l = []
r = utils.pretty_choice_list(l)
self.assertEqual(r, "")
self.assertEqual("", r)
l = ["v1", "v2", "v3"]
r = utils.pretty_choice_list(l)
self.assertEqual(r, "'v1', 'v2', 'v3'")
self.assertEqual("'v1', 'v2', 'v3'", r)
def test_pretty_choice_dict(self):
d = {}
r = utils.pretty_choice_dict(d)
self.assertEqual(r, "")
self.assertEqual("", r)
d = {"k1": "v1",
"k2": "v2",
"k3": "v3"}
r = utils.pretty_choice_dict(d)
self.assertEqual(r, "'k1=v1', 'k2=v2', 'k3=v3'")
self.assertEqual("'k1=v1', 'k2=v2', 'k3=v3'", r)
class ValidationsTestCase(test_utils.TestCase):

4
novaclient/tests/v1_1/test_agents.py
View File

@ -63,7 +63,7 @@ class AgentsTest(utils.FixturedTestCase):
self.assert_called('GET', '/os-agents')
for a in ags:
self.assertIsInstance(a, agents.Agent)
self.assertEqual(a.hypervisor, 'kvm')
self.assertEqual('kvm', a.hypervisor)
def test_list_agents_with_hypervisor(self):
self.stub_hypervisors('xen')
@ -71,7 +71,7 @@ class AgentsTest(utils.FixturedTestCase):
self.assert_called('GET', '/os-agents?hypervisor=xen')
for a in ags:
self.assertIsInstance(a, agents.Agent)
self.assertEqual(a.hypervisor, 'xen')
self.assertEqual('xen', a.hypervisor)
def test_agents_create(self):
ag = self.cs.agents.create('win', 'x86', '7.0',

4
novaclient/tests/v1_1/test_availability_zone.py
View File

@ -58,7 +58,7 @@ class AvailabilityZoneTest(utils.FixturedTestCase):
z0 = self.shell._treeizeAvailabilityZone(zones[0])
z1 = self.shell._treeizeAvailabilityZone(zones[1])
self.assertEqual((len(z0), len(z1)), (1, 1))
self.assertEqual((1, 1), (len(z0), len(z1)))
self._assertZone(z0[0], l0[0], l0[1])
self._assertZone(z1[0], l1[0], l1[1])
@ -89,7 +89,7 @@ class AvailabilityZoneTest(utils.FixturedTestCase):
z1 = self.shell._treeizeAvailabilityZone(zones[1])
z2 = self.shell._treeizeAvailabilityZone(zones[2])
self.assertEqual((len(z0), len(z1), len(z2)), (3, 5, 1))
self.assertEqual((3, 5, 1), (len(z0), len(z1), len(z2)))
self._assertZone(z0[0], l0[0], l0[1])
self._assertZone(z0[1], l1[0], l1[1])

8
novaclient/tests/v1_1/test_fixed_ips.py
View File

@ -28,10 +28,10 @@ class FixedIpsTest(utils.FixturedTestCase):
def test_get_fixed_ip(self):
info = self.cs.fixed_ips.get(fixed_ip='192.168.1.1')
self.assert_called('GET', '/os-fixed-ips/192.168.1.1')
self.assertEqual(info.cidr, '192.168.1.0/24')
self.assertEqual(info.address, '192.168.1.1')
self.assertEqual(info.hostname, 'foo')
self.assertEqual(info.host, 'bar')
self.assertEqual('192.168.1.0/24', info.cidr)
self.assertEqual('192.168.1.1', info.address)
self.assertEqual('foo', info.hostname)
self.assertEqual('bar', info.host)
def test_reserve_fixed_ip(self):
body = {"reserve": None}

28
novaclient/tests/v1_1/test_flavors.py
View File

@ -67,36 +67,36 @@ class FlavorsTest(utils.TestCase):
f = self.cs.flavors.get(1)
self.cs.assert_called('GET', '/flavors/1')
self.assertIsInstance(f, self.flavor_type)
self.assertEqual(f.ram, 256)
self.assertEqual(f.disk, 10)
self.assertEqual(f.ephemeral, 10)
self.assertEqual(f.is_public, True)
self.assertEqual(256, f.ram)
self.assertEqual(10, f.disk)
self.assertEqual(10, f.ephemeral)
self.assertEqual(True, f.is_public)
def test_get_flavor_details_alphanum_id(self):
f = self.cs.flavors.get('aa1')
self.cs.assert_called('GET', '/flavors/aa1')
self.assertIsInstance(f, self.flavor_type)
self.assertEqual(f.ram, 128)
self.assertEqual(f.disk, 0)
self.assertEqual(f.ephemeral, 0)
self.assertEqual(f.is_public, True)
self.assertEqual(128, f.ram)
self.assertEqual(0, f.disk)
self.assertEqual(0, f.ephemeral)
self.assertEqual(True, f.is_public)
def test_get_flavor_details_diablo(self):
f = self.cs.flavors.get(3)
self.cs.assert_called('GET', '/flavors/3')
self.assertIsInstance(f, self.flavor_type)
self.assertEqual(f.ram, 256)
self.assertEqual(f.disk, 10)
self.assertEqual(f.ephemeral, 'N/A')
self.assertEqual(f.is_public, 'N/A')
self.assertEqual(256, f.ram)
self.assertEqual(10, f.disk)
self.assertEqual('N/A', f.ephemeral)
self.assertEqual('N/A', f.is_public)
def test_find(self):
f = self.cs.flavors.find(ram=256)
self.cs.assert_called('GET', '/flavors/detail')
self.assertEqual(f.name, '256 MB Server')
self.assertEqual('256 MB Server', f.name)
f = self.cs.flavors.find(disk=0)
self.assertEqual(f.name, '128 MB Server')
self.assertEqual('128 MB Server', f.name)
self.assertRaises(exceptions.NotFound, self.cs.flavors.find,
disk=12345)

8
novaclient/tests/v1_1/test_floating_ip_dns.py
View File

@ -25,13 +25,13 @@ class FloatingIPDNSDomainTest(utils.FixturedTestCase):
def test_dns_domains(self):
domainlist = self.cs.dns_domains.domains()
self.assertEqual(len(domainlist), 2)
self.assertEqual(2, len(domainlist))
for entry in domainlist:
self.assertIsInstance(entry,
floating_ip_dns.FloatingIPDNSDomain)
self.assertEqual(domainlist[1].domain, 'example.com')
self.assertEqual('example.com', domainlist[1].domain)
def test_create_private_domain(self):
self.cs.dns_domains.create_private(self.testdomain, 'test_avzone')
@ -61,13 +61,13 @@ class FloatingIPDNSEntryTest(utils.FixturedTestCase):
def test_get_dns_entries_by_ip(self):
entries = self.cs.dns_entries.get_for_ip(self.testdomain,
ip=self.testip)
self.assertEqual(len(entries), 2)
self.assertEqual(2, len(entries))
for entry in entries:
self.assertIsInstance(entry,
floating_ip_dns.FloatingIPDNSEntry)
self.assertEqual(entries[1].dns_entry['name'], 'host2')
self.assertEqual('host2', entries[1].dns_entry['name'])
self.assertEqual(entries[1].dns_entry['ip'], self.testip)
def test_get_dns_entry_by_name(self):

2
novaclient/tests/v1_1/test_floating_ips.py
View File

@ -55,5 +55,5 @@ class FloatingIPsTest(utils.FixturedTestCase):
def test_create_floating_ip_with_pool(self):
fl = self.cs.floating_ips.create('nova')
self.assert_called('POST', '/os-floating-ips')
self.assertEqual(fl.pool, 'nova')
self.assertEqual('nova', fl.pool)
self.assertIsInstance(fl, floating_ips.FloatingIP)

10
novaclient/tests/v1_1/test_fping.py
View File

@ -26,15 +26,15 @@ class FpingTest(utils.FixturedTestCase):
def test_fping_repr(self):
r = self.cs.fping.get(1)
self.assertEqual(repr(r), "<Fping: 1>")
self.assertEqual("<Fping: 1>", repr(r))
def test_list_fpings(self):
fl = self.cs.fping.list()
self.assert_called('GET', '/os-fping')
for f in fl:
self.assertIsInstance(f, fping.Fping)
self.assertEqual(f.project_id, "fake-project")
self.assertEqual(f.alive, True)
self.assertEqual("fake-project", f.project_id)
self.assertEqual(True, f.alive)
def test_list_fpings_all_tenants(self):
fl = self.cs.fping.list(all_tenants=True)
@ -58,5 +58,5 @@ class FpingTest(utils.FixturedTestCase):
f = self.cs.fping.get(1)
self.assert_called('GET', '/os-fping/1')
self.assertIsInstance(f, fping.Fping)
self.assertEqual(f.project_id, "fake-project")
self.assertEqual(f.alive, True)
self.assertEqual("fake-project", f.project_id)
self.assertEqual(True, f.alive)

10
novaclient/tests/v1_1/test_images.py
View File

@ -40,8 +40,8 @@ class ImagesTest(utils.FixturedTestCase):
i = self.cs.images.get(1)
self.assert_called('GET', '/images/1')
self.assertIsInstance(i, images.Image)
self.assertEqual(i.id, 1)
self.assertEqual(i.name, 'CentOS 5.2')
self.assertEqual(1, i.id)
self.assertEqual('CentOS 5.2', i.name)
def test_delete_image(self):
self.cs.images.delete(1)
@ -58,9 +58,9 @@ class ImagesTest(utils.FixturedTestCase):
def test_find(self):
i = self.cs.images.find(name="CentOS 5.2")
self.assertEqual(i.id, 1)
self.assertEqual(1, i.id)
self.assert_called('GET', '/images/1')
iml = self.cs.images.findall(status='SAVING')
self.assertEqual(len(iml), 1)
self.assertEqual(iml[0].name, 'My Server Backup')
self.assertEqual(1, len(iml))
self.assertEqual('My Server Backup', iml[0].name)

2
novaclient/tests/v1_1/test_keypairs.py
View File

@ -37,7 +37,7 @@ class KeypairsTest(utils.FixturedTestCase):
kp = self.cs.keypairs.get('test')
self.assert_called('GET', '/%s/test' % self.keypair_prefix)
self.assertIsInstance(kp, keypairs.Keypair)
self.assertEqual(kp.name, 'test')
self.assertEqual('test', kp.name)
def test_list_keypairs(self):
kps = self.cs.keypairs.list()

28
novaclient/tests/v1_1/test_servers.py
View File

@ -53,8 +53,8 @@ class ServersTest(utils.FixturedTestCase):
s = self.cs.servers.get(1234)
self.assert_called('GET', '/servers/1234')
self.assertIsInstance(s, servers.Server)
self.assertEqual(s.id, 1234)
self.assertEqual(s.status, 'BUILD')
self.assertEqual(1234, s.id)
self.assertEqual('BUILD', s.status)
def test_get_server_promote_details(self):
s1 = self.cs.servers.list(detailed=False)[0]
@ -244,13 +244,13 @@ class ServersTest(utils.FixturedTestCase):
def test_find(self):
server = self.cs.servers.find(name='sample-server')
self.assert_called('GET', '/servers/1234')
self.assertEqual(server.name, 'sample-server')
self.assertEqual('sample-server', server.name)
self.assertRaises(exceptions.NoUniqueMatch, self.cs.servers.find,
flavor={"id": 1, "name": "256 MB Server"})
sl = self.cs.servers.findall(flavor={"id": 1, "name": "256 MB Server"})
self.assertEqual([s.id for s in sl], [1234, 5678, 9012])
self.assertEqual([1234, 5678, 9012], [s.id for s in sl])
def test_reboot_server(self):
s = self.cs.servers.get(1234)
@ -299,7 +299,7 @@ class ServersTest(utils.FixturedTestCase):
body = httpretty.last_request().parsed_body
d = body['rebuild']
self.assertIn('preserve_ephemeral', d)
self.assertEqual(d['preserve_ephemeral'], True)
self.assertEqual(True, d['preserve_ephemeral'])
def test_rebuild_server_name_meta_files(self):
files = {'/etc/passwd': 'some data'}
@ -464,11 +464,11 @@ class ServersTest(utils.FixturedTestCase):
success = 'foo'
s = self.cs.servers.get(1234)
s.get_console_output()
self.assertEqual(s.get_console_output(), success)
self.assertEqual(success, s.get_console_output())
self.assert_called('POST', '/servers/1234/action')
self.cs.servers.get_console_output(s)
self.assertEqual(self.cs.servers.get_console_output(s), success)
self.assertEqual(success, self.cs.servers.get_console_output(s))
self.assert_called('POST', '/servers/1234/action')
def test_get_console_output_with_length(self):
@ -476,12 +476,12 @@ class ServersTest(utils.FixturedTestCase):
s = self.cs.servers.get(1234)
s.get_console_output(length=50)
self.assertEqual(s.get_console_output(length=50), success)
self.assertEqual(success, s.get_console_output(length=50))
self.assert_called('POST', '/servers/1234/action')
self.cs.servers.get_console_output(s, length=50)
self.assertEqual(self.cs.servers.get_console_output(s, length=50),
success)
self.assertEqual(success,
self.cs.servers.get_console_output(s, length=50))
self.assert_called('POST', '/servers/1234/action')
# Testing password methods with the following password and key
@ -500,19 +500,19 @@ class ServersTest(utils.FixturedTestCase):
def test_get_password(self):
s = self.cs.servers.get(1234)
self.assertEqual(s.get_password('novaclient/tests/idfake.pem'),
b'FooBar123')
self.assertEqual(b'FooBar123',
s.get_password('novaclient/tests/idfake.pem'))
self.assert_called('GET', '/servers/1234/os-server-password')
def test_get_password_without_key(self):
s = self.cs.servers.get(1234)
self.assertEqual(s.get_password(),
self.assertEqual(
'OIuEuQttO8Rk93BcKlwHQsziDAnkAm/V6V8VPToA8ZeUaUBWwS0gwo2K6Y61Z96r'
'qG447iRz0uTEEYq3RAYJk1mh3mMIRVl27t8MtIecR5ggVVbz1S9AwXJQypDKl0ho'
'QFvhCBcMWPohyGewDJOhDbtuN1IoFI9G55ZvFwCm5y7m7B2aVcoLeIsJZE4PLsIw'
'/y5a6Z3/AoJZYGG7IH5WN88UROU3B9JZGFB2qtPLQTOvDMZLUhoPRIJeHiVSlo1N'
'tI2/++UsXVg3ow6ItqCJGgdNuGG5JB+bslDHWPxROpesEIHdczk46HCpHQN8f1sk'
'Hi/fmZZNQQqj1Ijq0caOIw==')
'Hi/fmZZNQQqj1Ijq0caOIw==', s.get_password())
self.assert_called('GET', '/servers/1234/os-server-password')
def test_clear_password(self):

22
novaclient/tests/v1_1/test_services.py
View File

@ -35,8 +35,8 @@ class ServicesTest(utils.TestCase):
self.cs.assert_called('GET', '/os-services')
for s in svs:
self.assertIsInstance(s, self._get_service_type())
self.assertEqual(s.binary, 'nova-compute')
self.assertEqual(s.host, 'host1')
self.assertEqual('nova-compute', s.binary)
self.assertEqual('host1', s.host)
self.assertTrue(str(s).startswith('<Service: '))
def test_list_services_with_hostname(self):
@ -44,16 +44,16 @@ class ServicesTest(utils.TestCase):
self.cs.assert_called('GET', '/os-services?host=host2')
for s in svs:
self.assertIsInstance(s, self._get_service_type())
self.assertEqual(s.binary, 'nova-compute')
self.assertEqual(s.host, 'host2')
self.assertEqual('nova-compute', s.binary)
self.assertEqual('host2', s.host)
def test_list_services_with_binary(self):
svs = self.cs.services.list(binary='nova-cert')
self.cs.assert_called('GET', '/os-services?binary=nova-cert')
for s in svs:
self.assertIsInstance(s, self._get_service_type())
self.assertEqual(s.binary, 'nova-cert')
self.assertEqual(s.host, 'host1')
self.assertEqual('nova-cert', s.binary)
self.assertEqual('host1', s.host)
def test_list_services_with_host_binary(self):
svs = self.cs.services.list(host='host2', binary='nova-cert')
@ -61,8 +61,8 @@ class ServicesTest(utils.TestCase):
'/os-services?host=host2&binary=nova-cert')
for s in svs:
self.assertIsInstance(s, self._get_service_type())
self.assertEqual(s.binary, 'nova-cert')
self.assertEqual(s.host, 'host2')
self.assertEqual('nova-cert', s.binary)
self.assertEqual('host2', s.host)
def _update_body(self, host, binary, disabled_reason=None):
body = {"host": host,
@ -76,7 +76,7 @@ class ServicesTest(utils.TestCase):
values = self._update_body("host1", "nova-cert")
self.cs.assert_called('PUT', '/os-services/enable', values)
self.assertIsInstance(service, self._get_service_type())
self.assertEqual(service.status, 'enabled')
self.assertEqual('enabled', service.status)
def test_services_delete(self):
self.cs.services.delete('1')
@ -87,7 +87,7 @@ class ServicesTest(utils.TestCase):
values = self._update_body("host1", "nova-cert")
self.cs.assert_called('PUT', '/os-services/disable', values)
self.assertIsInstance(service, self._get_service_type())
self.assertEqual(service.status, 'disabled')
self.assertEqual('disabled', service.status)
def test_services_disable_log_reason(self):
service = self.cs.services.disable_log_reason(
@ -96,4 +96,4 @@ class ServicesTest(utils.TestCase):
"disable bad host")
self.cs.assert_called('PUT', '/os-services/disable-log-reason', values)
self.assertIsInstance(service, self._get_service_type())
self.assertEqual(service.status, 'disabled')
self.assertEqual('disabled', service.status)

6
novaclient/tests/v1_1/test_shell.py
View File

@ -655,7 +655,7 @@ class ShellTest(utils.TestCase):
'max_count': 1,
}},
)
self.assertEqual(poll_method.call_count, 1)
self.assertEqual(1, poll_method.call_count)
poll_method.assert_has_calls(
[mock.call(self.shell.cs.servers.get, 1234, 'building',
['active'])])
@ -2155,7 +2155,7 @@ class GetSecgroupTest(utils.TestCase):
'security_groups.list.return_value': [],
})
result = novaclient.v1_1.shell._get_secgroup(cs, '1')
self.assertEqual(result, 'sec_group')
self.assertEqual('sec_group', result)
cs.security_groups.get.assert_called_once_with('1')
def test_with_uuid(self):
@ -2165,7 +2165,7 @@ class GetSecgroupTest(utils.TestCase):
})
result = novaclient.v1_1.shell._get_secgroup(
cs, 'c0c32459-dc5f-44dc-9a0a-473b28bac831')
self.assertEqual(result, 'sec_group')
self.assertEqual('sec_group', result)
cs.security_groups.get.assert_called_once_with(
'c0c32459-dc5f-44dc-9a0a-473b28bac831')

4
novaclient/tests/v3/test_hosts.py
View File

@ -34,14 +34,14 @@ class HostsTest(utils.FixturedTestCase):
self.assert_called('GET', '/os-hosts')
for h in hs:
self.assertIsInstance(h, hosts.Host)
self.assertEqual(h.zone, 'nova1')
self.assertEqual('nova1', h.zone)
def test_list_host_with_zone(self):
hs = self.cs.hosts.list('nova')
self.assert_called('GET', '/os-hosts?zone=nova')
for h in hs:
self.assertIsInstance(h, hosts.Host)
self.assertEqual(h.zone, 'nova')
self.assertEqual('nova', h.zone)
def test_update_enable(self):
host = self.cs.hosts.get('sample_host')[0]

10
novaclient/tests/v3/test_images.py
View File

@ -44,14 +44,14 @@ class ImagesTest(utils.FixturedTestCase):
i = self.cs.images.get(1)
self.assert_called('HEAD', '/v1/images/1')
self.assertIsInstance(i, images.Image)
self.assertEqual(i.id, '1')
self.assertEqual(i.name, 'CentOS 5.2')
self.assertEqual('1', i.id)
self.assertEqual('CentOS 5.2', i.name)
def test_find(self):
i = self.cs.images.find(name="CentOS 5.2")
self.assertEqual(i.id, '1')
self.assertEqual('1', i.id)
self.assert_called('HEAD', '/v1/images/1')
iml = self.cs.images.findall(status='SAVING')
self.assertEqual(len(iml), 1)
self.assertEqual(iml[0].name, 'My Server Backup')
self.assertEqual(1, len(iml))
self.assertEqual('My Server Backup', iml[0].name)

24
novaclient/tests/v3/test_servers.py
View File

@ -50,8 +50,8 @@ class ServersTest(utils.FixturedTestCase):
s = self.cs.servers.get(1234)
self.assert_called('GET', '/servers/1234')
self.assertIsInstance(s, servers.Server)
self.assertEqual(s.id, 1234)
self.assertEqual(s.status, 'BUILD')
self.assertEqual(1234, s.id)
self.assertEqual('BUILD', s.status)
def test_get_server_promote_details(self):
s1 = self.cs.servers.list(detailed=False)[0]
@ -104,7 +104,7 @@ class ServersTest(utils.FixturedTestCase):
'v6-fixed-ip': '2001:db9:0:1::10'}]
def wrapped_boot(url, key, *boot_args, **boot_kwargs):
self.assertEqual(boot_kwargs['nics'], nics)
self.assertEqual(nics, boot_kwargs['nics'])
return old_boot(url, key, *boot_args, **boot_kwargs)
with mock.patch.object(self.cs.servers, '_boot', wrapped_boot):
@ -224,13 +224,13 @@ class ServersTest(utils.FixturedTestCase):
def test_find(self):
server = self.cs.servers.find(name='sample-server')
self.assert_called('GET', '/servers/1234')
self.assertEqual(server.name, 'sample-server')
self.assertEqual('sample-server', server.name)
self.assertRaises(exceptions.NoUniqueMatch, self.cs.servers.find,
flavor={"id": 1, "name": "256 MB Server"})
sl = self.cs.servers.findall(flavor={"id": 1, "name": "256 MB Server"})
self.assertEqual([s.id for s in sl], [1234, 5678, 9012])
self.assertEqual([1234, 5678, 9012], [s.id for s in sl])
def test_reboot_server(self):
s = self.cs.servers.get(1234)
@ -359,11 +359,11 @@ class ServersTest(utils.FixturedTestCase):
success = 'foo'
s = self.cs.servers.get(1234)
s.get_console_output()
self.assertEqual(s.get_console_output(), success)
self.assertEqual(success, s.get_console_output())
self.assert_called('POST', '/servers/1234/action')
self.cs.servers.get_console_output(s)
self.assertEqual(self.cs.servers.get_console_output(s), success)
self.assertEqual(success, self.cs.servers.get_console_output(s))
self.assert_called('POST', '/servers/1234/action',
{'get_console_output': {'length': -1}})
@ -372,19 +372,19 @@ class ServersTest(utils.FixturedTestCase):
s = self.cs.servers.get(1234)
s.get_console_output(length=50)
self.assertEqual(s.get_console_output(length=50), success)
self.assertEqual(success, s.get_console_output(length=50))
self.assert_called('POST', '/servers/1234/action',
{'get_console_output': {'length': 50}})
self.cs.servers.get_console_output(s, length=50)
self.assertEqual(self.cs.servers.get_console_output(s, length=50),
success)
self.assertEqual(success,
self.cs.servers.get_console_output(s, length=50))
self.assert_called('POST', '/servers/1234/action',
{'get_console_output': {'length': 50}})
def test_get_password(self):
s = self.cs.servers.get(1234)
self.assertEqual(s.get_password('/foo/id_rsa'), '')
self.assertEqual('', s.get_password('/foo/id_rsa'))
self.assert_called('GET', '/servers/1234/os-server-password')
def test_clear_password(self):
@ -402,7 +402,7 @@ class ServersTest(utils.FixturedTestCase):
self.assertTrue(diagnostics_from_manager is not None)
self.assert_called('GET', '/servers/1234/os-server-diagnostics')
self.assertEqual(diagnostics[1], diagnostics_from_manager[1])
self.assertEqual(diagnostics_from_manager[1], diagnostics[1])
def test_get_vnc_console(self):
s = self.cs.servers.get(1234)

2
novaclient/tests/v3/test_shell.py
View File

@ -554,7 +554,7 @@ class ShellTest(utils.TestCase):
'os-multiple-create:max_count': 1,
}},
)
self.assertEqual(poll_method.call_count, 1)
self.assertEqual(1, poll_method.call_count)
poll_method.assert_has_calls(
[mock.call(self.shell.cs.servers.get, 1234, 'building',
['active'])])