Fix order of arguments in assertEqual
Some tests used incorrect order assertEqual(observed, expected). The correct order expected by testtools is assertEqual(expected, observed). Partial-Bug: #1259292 Change-Id: Ie57021baffb208babdfa42c72e4d5b4e8c2b1c18
This commit is contained in:
Rajesh Tailor
parent
e349663cf2
commit
3622a20f2d
|
|
@ -280,15 +280,13 @@ class ExtensionControllerTest(ExtensionTestCase):
|
|||
# Make sure that at least Fox in Sox is correct.
|
||||
(fox_ext, ) = [
|
||||
x for x in data['extensions'] if x['alias'] == 'FOXNSOX']
|
||||
self.assertEqual(fox_ext, {
|
||||
'namespace': 'http://www.fox.in.socks/api/ext/pie/v1.0',
|
||||
self.assertEqual(
|
||||
{'namespace': 'http://www.fox.in.socks/api/ext/pie/v1.0',
|
||||
'name': 'Fox In Socks',
|
||||
'updated': '2011-01-22T13:25:27-06:00',
|
||||
'description': 'The Fox In Socks Extension.',
|
||||
'alias': 'FOXNSOX',
|
||||
'links': []
|
||||
},
|
||||
)
|
||||
'links': []}, fox_ext)
|
||||
|
||||
for ext in data['extensions']:
|
||||
url = '/fake/extensions/%s' % ext['alias']
|
||||
|
|
@ -304,13 +302,13 @@ class ExtensionControllerTest(ExtensionTestCase):
|
|||
self.assertEqual(200, response.status_int)
|
||||
|
||||
data = jsonutils.loads(response.body)
|
||||
self.assertEqual(data['extension'], {
|
||||
"namespace": "http://www.fox.in.socks/api/ext/pie/v1.0",
|
||||
"name": "Fox In Socks",
|
||||
"updated": "2011-01-22T13:25:27-06:00",
|
||||
"description": "The Fox In Socks Extension.",
|
||||
"alias": "FOXNSOX",
|
||||
"links": []})
|
||||
self.assertEqual({
|
||||
"namespace": "http://www.fox.in.socks/api/ext/pie/v1.0",
|
||||
"name": "Fox In Socks",
|
||||
"updated": "2011-01-22T13:25:27-06:00",
|
||||
"description": "The Fox In Socks Extension.",
|
||||
"alias": "FOXNSOX",
|
||||
"links": []}, data['extension'])
|
||||
|
||||
def test_get_non_existing_extension_json(self):
|
||||
app = compute.APIRouter(init_only=('extensions',))
|
||||
|
|
@ -621,12 +619,12 @@ class ExtensionControllerIdFormatTest(test.NoDBTestCase):
|
|||
|
||||
def test_id_with_xml_format(self):
|
||||
result = self._bounce_id('foo.xml')
|
||||
self.assertEqual(result, 'foo')
|
||||
self.assertEqual('foo', result)
|
||||
|
||||
def test_id_with_json_format(self):
|
||||
result = self._bounce_id('foo.json')
|
||||
self.assertEqual(result, 'foo')
|
||||
self.assertEqual('foo', result)
|
||||
|
||||
def test_id_with_bad_format(self):
|
||||
result = self._bounce_id('foo.bad')
|
||||
self.assertEqual(result, 'foo.bad')
|
||||
self.assertEqual('foo.bad', result)
|
||||
|
|
|
|||
|
|
@ -128,19 +128,19 @@ class Base64ValidationTest(test.TestCase):
|
|||
def test_decode_base64(self):
|
||||
value = "A random string"
|
||||
result = self.controller._decode_base64(base64.b64encode(value))
|
||||
self.assertEqual(result, value)
|
||||
self.assertEqual(value, result)
|
||||
|
||||
def test_decode_base64_binary(self):
|
||||
value = "\x00\x12\x75\x99"
|
||||
result = self.controller._decode_base64(base64.b64encode(value))
|
||||
self.assertEqual(result, value)
|
||||
self.assertEqual(value, result)
|
||||
|
||||
def test_decode_base64_whitespace(self):
|
||||
value = "A random string"
|
||||
encoded = base64.b64encode(value)
|
||||
white = "\n \n%s\t%s\n" % (encoded[:2], encoded[2:])
|
||||
result = self.controller._decode_base64(white)
|
||||
self.assertEqual(result, value)
|
||||
self.assertEqual(value, result)
|
||||
|
||||
def test_decode_base64_invalid(self):
|
||||
invalid = "A random string"
|
||||
|
|
@ -271,7 +271,7 @@ class ServersControllerTest(ControllerTest):
|
|||
def test_get_server_by_uuid(self):
|
||||
req = fakes.HTTPRequest.blank('/fake/servers/%s' % FAKE_UUID)
|
||||
res_dict = self.controller.show(req, FAKE_UUID)
|
||||
self.assertEqual(res_dict['server']['id'], FAKE_UUID)
|
||||
self.assertEqual(FAKE_UUID, res_dict['server']['id'])
|
||||
|
||||
def test_unique_host_id(self):
|
||||
"""Create two servers with the same host and different
|
||||
|
|
@ -495,7 +495,7 @@ class ServersControllerTest(ControllerTest):
|
|||
|
||||
i = 0
|
||||
for s in res_dict['servers']:
|
||||
self.assertEqual(s.get('name'), 'server%d' % (i + 1))
|
||||
self.assertEqual('server%d' % (i + 1), s.get('name'))
|
||||
i += 1
|
||||
|
||||
def test_get_server_list_with_reservation_id_empty(self):
|
||||
|
|
@ -505,7 +505,7 @@ class ServersControllerTest(ControllerTest):
|
|||
|
||||
i = 0
|
||||
for s in res_dict['servers']:
|
||||
self.assertEqual(s.get('name'), 'server%d' % (i + 1))
|
||||
self.assertEqual('server%d' % (i + 1), s.get('name'))
|
||||
i += 1
|
||||
|
||||
def test_get_server_list_with_reservation_id_details(self):
|
||||
|
|
@ -515,17 +515,17 @@ class ServersControllerTest(ControllerTest):
|
|||
|
||||
i = 0
|
||||
for s in res_dict['servers']:
|
||||
self.assertEqual(s.get('name'), 'server%d' % (i + 1))
|
||||
self.assertEqual('server%d' % (i + 1), s.get('name'))
|
||||
i += 1
|
||||
|
||||
def test_get_server_list(self):
|
||||
req = fakes.HTTPRequest.blank('/fake/servers')
|
||||
res_dict = self.controller.index(req)
|
||||
|
||||
self.assertEqual(len(res_dict['servers']), 5)
|
||||
self.assertEqual(5, len(res_dict['servers']))
|
||||
for i, s in enumerate(res_dict['servers']):
|
||||
self.assertEqual(s['id'], fakes.get_fake_uuid(i))
|
||||
self.assertEqual(s['name'], 'server%d' % (i + 1))
|
||||
self.assertEqual(fakes.get_fake_uuid(i), s['id'])
|
||||
self.assertEqual('server%d' % (i + 1), s['name'])
|
||||
self.assertIsNone(s.get('image', None))
|
||||
|
||||
expected_links = [
|
||||
|
|
@ -539,18 +539,18 @@ class ServersControllerTest(ControllerTest):
|
|||
},
|
||||
]
|
||||
|
||||
self.assertEqual(s['links'], expected_links)
|
||||
self.assertEqual(expected_links, s['links'])
|
||||
|
||||
def test_get_servers_with_limit(self):
|
||||
req = fakes.HTTPRequest.blank('/fake/servers?limit=3')
|
||||
res_dict = self.controller.index(req)
|
||||
|
||||
servers = res_dict['servers']
|
||||
self.assertEqual([s['id'] for s in servers],
|
||||
[fakes.get_fake_uuid(i) for i in range(len(servers))])
|
||||
self.assertEqual([fakes.get_fake_uuid(i) for i in range(len(servers))],
|
||||
[s['id'] for s in servers])
|
||||
|
||||
servers_links = res_dict['servers_links']
|
||||
self.assertEqual(servers_links[0]['rel'], 'next')
|
||||
self.assertEqual('next', servers_links[0]['rel'])
|
||||
href_parts = urlparse.urlparse(servers_links[0]['href'])
|
||||
self.assertEqual('/v2/fake/servers', href_parts.path)
|
||||
params = urlparse.parse_qs(href_parts.query)
|
||||
|
|
@ -578,11 +578,11 @@ class ServersControllerTest(ControllerTest):
|
|||
res = self.controller.detail(req)
|
||||
|
||||
servers = res['servers']
|
||||
self.assertEqual([s['id'] for s in servers],
|
||||
[fakes.get_fake_uuid(i) for i in range(len(servers))])
|
||||
self.assertEqual([fakes.get_fake_uuid(i) for i in range(len(servers))],
|
||||
[s['id'] for s in servers])
|
||||
|
||||
servers_links = res['servers_links']
|
||||
self.assertEqual(servers_links[0]['rel'], 'next')
|
||||
self.assertEqual('next', servers_links[0]['rel'])
|
||||
|
||||
href_parts = urlparse.urlparse(servers_links[0]['href'])
|
||||
self.assertEqual('/v2/fake/servers/detail', href_parts.path)
|
||||
|
|
@ -602,11 +602,11 @@ class ServersControllerTest(ControllerTest):
|
|||
res = self.controller.detail(req)
|
||||
|
||||
servers = res['servers']
|
||||
self.assertEqual([s['id'] for s in servers],
|
||||
[fakes.get_fake_uuid(i) for i in range(len(servers))])
|
||||
self.assertEqual([fakes.get_fake_uuid(i) for i in range(len(servers))],
|
||||
[s['id'] for s in servers])
|
||||
|
||||
servers_links = res['servers_links']
|
||||
self.assertEqual(servers_links[0]['rel'], 'next')
|
||||
self.assertEqual('next', servers_links[0]['rel'])
|
||||
# Retrieve the parameters from the next link, they should contain the
|
||||
# same limit, filter, and sort information as the original request as
|
||||
# well as a marker; this ensures that the caller can simply use the
|
||||
|
|
@ -634,13 +634,13 @@ class ServersControllerTest(ControllerTest):
|
|||
url = '/v2/fake/servers?marker=%s' % fakes.get_fake_uuid(2)
|
||||
req = fakes.HTTPRequest.blank(url)
|
||||
servers = self.controller.index(req)['servers']
|
||||
self.assertEqual([s['name'] for s in servers], ["server4", "server5"])
|
||||
self.assertEqual(["server4", "server5"], [s['name'] for s in servers])
|
||||
|
||||
def test_get_servers_with_limit_and_marker(self):
|
||||
url = '/v2/fake/servers?limit=2&marker=%s' % fakes.get_fake_uuid(1)
|
||||
req = fakes.HTTPRequest.blank(url)
|
||||
servers = self.controller.index(req)['servers']
|
||||
self.assertEqual([s['name'] for s in servers], ['server3', 'server4'])
|
||||
self.assertEqual(['server3', 'server4'], [s['name'] for s in servers])
|
||||
|
||||
def test_get_servers_with_bad_marker(self):
|
||||
req = fakes.HTTPRequest.blank('/fake/servers?limit=2&marker=asdf')
|
||||
|
|
@ -654,7 +654,7 @@ class ServersControllerTest(ControllerTest):
|
|||
req = fakes.HTTPRequest.blank('/fake/servers'
|
||||
'?sort_key=id1&sort_dir=asc')
|
||||
self.controller.index(req)
|
||||
self.assertEqual(mock_compute_get_all.call_count, 1)
|
||||
self.assertEqual(1, mock_compute_get_all.call_count)
|
||||
# Ensure that sort_dirs and sort_dirs is correct
|
||||
kwargs = mock_compute_get_all.call_args[1]
|
||||
self.assertEqual(['id1'], kwargs['sort_keys'])
|
||||
|
|
@ -667,7 +667,7 @@ class ServersControllerTest(ControllerTest):
|
|||
req = fakes.HTTPRequest.blank('/fake/servers'
|
||||
'?sort_key=id1&sort_dir=asc')
|
||||
self.controller.index(req)
|
||||
self.assertEqual(mock_compute_get_all.call_count, 1)
|
||||
self.assertEqual(1, mock_compute_get_all.call_count)
|
||||
# Ensure that sort_dirs and sort_dirs is None
|
||||
kwargs = mock_compute_get_all.call_args[1]
|
||||
self.assertIsNone(kwargs['sort_keys'])
|
||||
|
|
@ -689,8 +689,8 @@ class ServersControllerTest(ControllerTest):
|
|||
req = fakes.HTTPRequest.blank('/fake/servers?unknownoption=whee')
|
||||
servers = self.controller.index(req)['servers']
|
||||
|
||||
self.assertEqual(len(servers), 1)
|
||||
self.assertEqual(servers[0]['id'], server_uuid)
|
||||
self.assertEqual(1, len(servers))
|
||||
self.assertEqual(server_uuid, servers[0]['id'])
|
||||
|
||||
def test_get_servers_allows_image(self):
|
||||
server_uuid = str(uuid.uuid4())
|
||||
|
|
@ -701,7 +701,7 @@ class ServersControllerTest(ControllerTest):
|
|||
expected_attrs=None):
|
||||
self.assertIsNotNone(search_opts)
|
||||
self.assertIn('image', search_opts)
|
||||
self.assertEqual(search_opts['image'], '12345')
|
||||
self.assertEqual('12345', search_opts['image'])
|
||||
db_list = [fakes.stub_instance(100, uuid=server_uuid)]
|
||||
return instance_obj._make_instance_list(
|
||||
context, objects.InstanceList(), db_list, FIELDS)
|
||||
|
|
@ -711,8 +711,8 @@ class ServersControllerTest(ControllerTest):
|
|||
req = fakes.HTTPRequest.blank('/fake/servers?image=12345')
|
||||
servers = self.controller.index(req)['servers']
|
||||
|
||||
self.assertEqual(len(servers), 1)
|
||||
self.assertEqual(servers[0]['id'], server_uuid)
|
||||
self.assertEqual(1, len(servers))
|
||||
self.assertEqual(server_uuid, servers[0]['id'])
|
||||
|
||||
def test_all_tenants_param_normal(self):
|
||||
def fake_get_all(context, search_opts=None, **kwargs):
|
||||
|
|
@ -724,7 +724,7 @@ class ServersControllerTest(ControllerTest):
|
|||
with mock.patch.object(compute_api.API, 'get_all') as mock_get:
|
||||
mock_get.side_effect = fake_get_all
|
||||
servers = self.controller.index(req)['servers']
|
||||
self.assertEqual(len(servers), 1)
|
||||
self.assertEqual(1, len(servers))
|
||||
|
||||
def test_all_tenants_param_one(self):
|
||||
def fake_get_all(api, context, search_opts=None, **kwargs):
|
||||
|
|
@ -735,7 +735,7 @@ class ServersControllerTest(ControllerTest):
|
|||
req = fakes.HTTPRequest.blank('/fake/servers?all_tenants=1',
|
||||
use_admin_context=True)
|
||||
servers = self.controller.index(req)['servers']
|
||||
self.assertEqual(len(servers), 1)
|
||||
self.assertEqual(1, len(servers))
|
||||
|
||||
def test_all_tenants_param_zero(self):
|
||||
def fake_get_all(api, context, search_opts=None, **kwargs):
|
||||
|
|
@ -747,7 +747,7 @@ class ServersControllerTest(ControllerTest):
|
|||
req = fakes.HTTPRequest.blank('/fake/servers?all_tenants=0',
|
||||
use_admin_context=True)
|
||||
servers = self.controller.index(req)['servers']
|
||||
self.assertEqual(len(servers), 1)
|
||||
self.assertEqual(1, len(servers))
|
||||
|
||||
def test_all_tenants_param_false(self):
|
||||
def fake_get_all(api, context, search_opts=None, **kwargs):
|
||||
|
|
@ -759,7 +759,7 @@ class ServersControllerTest(ControllerTest):
|
|||
req = fakes.HTTPRequest.blank('/fake/servers?all_tenants=false',
|
||||
use_admin_context=True)
|
||||
servers = self.controller.index(req)['servers']
|
||||
self.assertEqual(len(servers), 1)
|
||||
self.assertEqual(1, len(servers))
|
||||
|
||||
def test_all_tenants_param_invalid(self):
|
||||
def fake_get_all(api, context, search_opts=None, **kwargs):
|
||||
|
|
@ -776,7 +776,7 @@ class ServersControllerTest(ControllerTest):
|
|||
def test_admin_restricted_tenant(self):
|
||||
def fake_get_all(api, context, search_opts=None, **kwargs):
|
||||
self.assertIsNotNone(search_opts)
|
||||
self.assertEqual(search_opts['project_id'], 'fake')
|
||||
self.assertEqual('fake', search_opts['project_id'])
|
||||
return [fakes.stub_instance(100)]
|
||||
|
||||
self.stubs.Set(compute_api.API, 'get_all', fake_get_all)
|
||||
|
|
@ -784,7 +784,7 @@ class ServersControllerTest(ControllerTest):
|
|||
req = fakes.HTTPRequest.blank('/fake/servers',
|
||||
use_admin_context=True)
|
||||
servers = self.controller.index(req)['servers']
|
||||
self.assertEqual(len(servers), 1)
|
||||
self.assertEqual(1, len(servers))
|
||||
|
||||
def test_all_tenants_pass_policy(self):
|
||||
def fake_get_all(api, context, search_opts=None, **kwargs):
|
||||
|
|
@ -806,7 +806,7 @@ class ServersControllerTest(ControllerTest):
|
|||
|
||||
req = fakes.HTTPRequest.blank('/fake/servers?all_tenants=1')
|
||||
servers = self.controller.index(req)['servers']
|
||||
self.assertEqual(len(servers), 1)
|
||||
self.assertEqual(1, len(servers))
|
||||
|
||||
def test_all_tenants_fail_policy(self):
|
||||
def fake_get_all(api, context, search_opts=None, **kwargs):
|
||||
|
|
@ -837,7 +837,7 @@ class ServersControllerTest(ControllerTest):
|
|||
self.assertIsNotNone(search_opts)
|
||||
self.assertIn('flavor', search_opts)
|
||||
# flavor is an integer ID
|
||||
self.assertEqual(search_opts['flavor'], '12345')
|
||||
self.assertEqual('12345', search_opts['flavor'])
|
||||
db_list = [fakes.stub_instance(100, uuid=server_uuid)]
|
||||
return instance_obj._make_instance_list(
|
||||
context, objects.InstanceList(), db_list, FIELDS)
|
||||
|
|
@ -847,8 +847,8 @@ class ServersControllerTest(ControllerTest):
|
|||
req = fakes.HTTPRequest.blank('/fake/servers?flavor=12345')
|
||||
servers = self.controller.index(req)['servers']
|
||||
|
||||
self.assertEqual(len(servers), 1)
|
||||
self.assertEqual(servers[0]['id'], server_uuid)
|
||||
self.assertEqual(1, len(servers))
|
||||
self.assertEqual(server_uuid, servers[0]['id'])
|
||||
|
||||
def test_get_servers_with_bad_flavor(self):
|
||||
req = fakes.HTTPRequest.blank('/fake/servers?flavor=abcde')
|
||||
|
|
@ -856,7 +856,7 @@ class ServersControllerTest(ControllerTest):
|
|||
mock_get.return_value = objects.InstanceList(objects=[])
|
||||
servers = self.controller.index(req)['servers']
|
||||
|
||||
self.assertEqual(len(servers), 0)
|
||||
self.assertEqual(0, len(servers))
|
||||
|
||||
def test_get_server_details_with_bad_flavor(self):
|
||||
req = fakes.HTTPRequest.blank('/fake/servers/detail?flavor=abcde')
|
||||
|
|
@ -885,8 +885,8 @@ class ServersControllerTest(ControllerTest):
|
|||
req = fakes.HTTPRequest.blank('/fake/servers?status=active')
|
||||
servers = self.controller.index(req)['servers']
|
||||
|
||||
self.assertEqual(len(servers), 1)
|
||||
self.assertEqual(servers[0]['id'], server_uuid)
|
||||
self.assertEqual(1, len(servers))
|
||||
self.assertEqual(server_uuid, servers[0]['id'])
|
||||
|
||||
@mock.patch.object(compute_api.API, 'get_all')
|
||||
def test_get_servers_allows_multi_status(self, get_all_mock):
|
||||
|
|
@ -996,8 +996,8 @@ class ServersControllerTest(ControllerTest):
|
|||
req = fakes.HTTPRequest.blank('/servers?status=reboot')
|
||||
servers = self.controller.index(req)['servers']
|
||||
|
||||
self.assertEqual(len(servers), 1)
|
||||
self.assertEqual(servers[0]['id'], server_uuid)
|
||||
self.assertEqual(1, len(servers))
|
||||
self.assertEqual(server_uuid, servers[0]['id'])
|
||||
|
||||
def test_get_servers_resize_status(self):
|
||||
# Test when resize status, it maps list of vm states.
|
||||
|
|
@ -1019,15 +1019,15 @@ class ServersControllerTest(ControllerTest):
|
|||
req = fakes.HTTPRequest.blank('/fake/servers?status=resize')
|
||||
|
||||
servers = self.controller.detail(req)['servers']
|
||||
self.assertEqual(len(servers), 1)
|
||||
self.assertEqual(servers[0]['id'], server_uuid)
|
||||
self.assertEqual(1, len(servers))
|
||||
self.assertEqual(server_uuid, servers[0]['id'])
|
||||
|
||||
def test_get_servers_invalid_status(self):
|
||||
# Test getting servers by invalid status.
|
||||
req = fakes.HTTPRequest.blank('/fake/servers?status=baloney',
|
||||
use_admin_context=False)
|
||||
servers = self.controller.index(req)['servers']
|
||||
self.assertEqual(len(servers), 0)
|
||||
self.assertEqual(0, len(servers))
|
||||
|
||||
def test_get_servers_deleted_status_as_user(self):
|
||||
req = fakes.HTTPRequest.blank('/fake/servers?status=deleted',
|
||||
|
|
@ -1043,7 +1043,7 @@ class ServersControllerTest(ControllerTest):
|
|||
sort_keys=None, sort_dirs=None,
|
||||
expected_attrs=None):
|
||||
self.assertIn('vm_state', search_opts)
|
||||
self.assertEqual(search_opts['vm_state'], ['deleted'])
|
||||
self.assertEqual(['deleted'], search_opts['vm_state'])
|
||||
|
||||
return objects.InstanceList(
|
||||
objects=[fakes.stub_instance_obj(100, uuid=server_uuid)])
|
||||
|
|
@ -1054,8 +1054,8 @@ class ServersControllerTest(ControllerTest):
|
|||
use_admin_context=True)
|
||||
|
||||
servers = self.controller.detail(req)['servers']
|
||||
self.assertEqual(len(servers), 1)
|
||||
self.assertEqual(servers[0]['id'], server_uuid)
|
||||
self.assertEqual(1, len(servers))
|
||||
self.assertEqual(server_uuid, servers[0]['id'])
|
||||
|
||||
@mock.patch.object(compute_api.API, 'get_all')
|
||||
def test_get_servers_deleted_filter_str_to_bool(self, mock_get_all):
|
||||
|
|
@ -1115,7 +1115,7 @@ class ServersControllerTest(ControllerTest):
|
|||
expected_attrs=None):
|
||||
self.assertIsNotNone(search_opts)
|
||||
self.assertIn('name', search_opts)
|
||||
self.assertEqual(search_opts['name'], 'whee.*')
|
||||
self.assertEqual('whee.*', search_opts['name'])
|
||||
return objects.InstanceList(
|
||||
objects=[fakes.stub_instance_obj(100, uuid=server_uuid)])
|
||||
|
||||
|
|
@ -1124,8 +1124,8 @@ class ServersControllerTest(ControllerTest):
|
|||
req = fakes.HTTPRequest.blank('/fake/servers?name=whee.*')
|
||||
servers = self.controller.index(req)['servers']
|
||||
|
||||
self.assertEqual(len(servers), 1)
|
||||
self.assertEqual(servers[0]['id'], server_uuid)
|
||||
self.assertEqual(1, len(servers))
|
||||
self.assertEqual(server_uuid, servers[0]['id'])
|
||||
|
||||
def test_get_servers_allows_changes_since(self):
|
||||
server_uuid = str(uuid.uuid4())
|
||||
|
|
@ -1138,7 +1138,7 @@ class ServersControllerTest(ControllerTest):
|
|||
self.assertIn('changes-since', search_opts)
|
||||
changes_since = datetime.datetime(2011, 1, 24, 17, 8, 1,
|
||||
tzinfo=iso8601.iso8601.UTC)
|
||||
self.assertEqual(search_opts['changes-since'], changes_since)
|
||||
self.assertEqual(changes_since, search_opts['changes-since'])
|
||||
self.assertNotIn('deleted', search_opts)
|
||||
return objects.InstanceList(
|
||||
objects=[fakes.stub_instance_obj(100, uuid=server_uuid)])
|
||||
|
|
@ -1149,8 +1149,8 @@ class ServersControllerTest(ControllerTest):
|
|||
req = fakes.HTTPRequest.blank('/fake/servers?%s' % params)
|
||||
servers = self.controller.index(req)['servers']
|
||||
|
||||
self.assertEqual(len(servers), 1)
|
||||
self.assertEqual(servers[0]['id'], server_uuid)
|
||||
self.assertEqual(1, len(servers))
|
||||
self.assertEqual(server_uuid, servers[0]['id'])
|
||||
|
||||
def test_get_servers_allows_changes_since_bad_value(self):
|
||||
params = 'changes-since=asdf'
|
||||
|
|
@ -1186,8 +1186,8 @@ class ServersControllerTest(ControllerTest):
|
|||
res = self.controller.index(req)
|
||||
|
||||
servers = res['servers']
|
||||
self.assertEqual(len(servers), 1)
|
||||
self.assertEqual(servers[0]['id'], server_uuid)
|
||||
self.assertEqual(1, len(servers))
|
||||
self.assertEqual(server_uuid, servers[0]['id'])
|
||||
|
||||
def test_get_servers_admin_options_as_admin(self):
|
||||
"""Test getting servers by admin-only or unknown options when
|
||||
|
|
@ -1217,8 +1217,8 @@ class ServersControllerTest(ControllerTest):
|
|||
use_admin_context=True)
|
||||
servers = self.controller.index(req)['servers']
|
||||
|
||||
self.assertEqual(len(servers), 1)
|
||||
self.assertEqual(servers[0]['id'], server_uuid)
|
||||
self.assertEqual(1, len(servers))
|
||||
self.assertEqual(server_uuid, servers[0]['id'])
|
||||
|
||||
def test_get_servers_allows_ip(self):
|
||||
"""Test getting servers by ip."""
|
||||
|
|
@ -1230,7 +1230,7 @@ class ServersControllerTest(ControllerTest):
|
|||
expected_attrs=None):
|
||||
self.assertIsNotNone(search_opts)
|
||||
self.assertIn('ip', search_opts)
|
||||
self.assertEqual(search_opts['ip'], '10\..*')
|
||||
self.assertEqual('10\..*', search_opts['ip'])
|
||||
return objects.InstanceList(
|
||||
objects=[fakes.stub_instance_obj(100, uuid=server_uuid)])
|
||||
|
||||
|
|
@ -1239,8 +1239,8 @@ class ServersControllerTest(ControllerTest):
|
|||
req = fakes.HTTPRequest.blank('/fake/servers?ip=10\..*')
|
||||
servers = self.controller.index(req)['servers']
|
||||
|
||||
self.assertEqual(len(servers), 1)
|
||||
self.assertEqual(servers[0]['id'], server_uuid)
|
||||
self.assertEqual(1, len(servers))
|
||||
self.assertEqual(server_uuid, servers[0]['id'])
|
||||
|
||||
def test_get_servers_admin_allows_ip6(self):
|
||||
"""Test getting servers by ip6 with admin_api enabled and
|
||||
|
|
@ -1254,7 +1254,7 @@ class ServersControllerTest(ControllerTest):
|
|||
expected_attrs=None):
|
||||
self.assertIsNotNone(search_opts)
|
||||
self.assertIn('ip6', search_opts)
|
||||
self.assertEqual(search_opts['ip6'], 'ffff.*')
|
||||
self.assertEqual('ffff.*', search_opts['ip6'])
|
||||
return objects.InstanceList(
|
||||
objects=[fakes.stub_instance_obj(100, uuid=server_uuid)])
|
||||
|
||||
|
|
@ -1264,8 +1264,8 @@ class ServersControllerTest(ControllerTest):
|
|||
use_admin_context=True)
|
||||
servers = self.controller.index(req)['servers']
|
||||
|
||||
self.assertEqual(len(servers), 1)
|
||||
self.assertEqual(servers[0]['id'], server_uuid)
|
||||
self.assertEqual(1, len(servers))
|
||||
self.assertEqual(server_uuid, servers[0]['id'])
|
||||
|
||||
def test_get_all_server_details(self):
|
||||
expected_flavor = {
|
||||
|
|
@ -1290,13 +1290,13 @@ class ServersControllerTest(ControllerTest):
|
|||
res_dict = self.controller.detail(req)
|
||||
|
||||
for i, s in enumerate(res_dict['servers']):
|
||||
self.assertEqual(s['id'], fakes.get_fake_uuid(i))
|
||||
self.assertEqual(s['hostId'], '')
|
||||
self.assertEqual(s['name'], 'server%d' % (i + 1))
|
||||
self.assertEqual(s['image'], expected_image)
|
||||
self.assertEqual(s['flavor'], expected_flavor)
|
||||
self.assertEqual(s['status'], 'BUILD')
|
||||
self.assertEqual(s['metadata']['seq'], str(i + 1))
|
||||
self.assertEqual(fakes.get_fake_uuid(i), s['id'])
|
||||
self.assertEqual('', s['hostId'])
|
||||
self.assertEqual('server%d' % (i + 1), s['name'])
|
||||
self.assertEqual(expected_image, s['image'])
|
||||
self.assertEqual(expected_flavor, s['flavor'])
|
||||
self.assertEqual('BUILD', s['status'])
|
||||
self.assertEqual(str(i + 1), s['metadata']['seq'])
|
||||
|
||||
def test_get_all_server_details_with_host(self):
|
||||
"""We want to make sure that if two instances are on the same host,
|
||||
|
|
@ -1326,9 +1326,9 @@ class ServersControllerTest(ControllerTest):
|
|||
self.assertNotEqual(host_ids[0], host_ids[1])
|
||||
|
||||
for i, s in enumerate(server_list):
|
||||
self.assertEqual(s['id'], fakes.get_fake_uuid(i))
|
||||
self.assertEqual(s['hostId'], host_ids[i % 2])
|
||||
self.assertEqual(s['name'], 'server%d' % (i + 1))
|
||||
self.assertEqual(fakes.get_fake_uuid(i), s['id'])
|
||||
self.assertEqual(host_ids[i % 2], s['hostId'])
|
||||
self.assertEqual('server%d' % (i + 1), s['name'])
|
||||
|
||||
|
||||
class ServersControllerUpdateTest(ControllerTest):
|
||||
|
|
@ -1354,10 +1354,10 @@ class ServersControllerUpdateTest(ControllerTest):
|
|||
'access_ipv6': 'beef::0123'})
|
||||
res_dict = self.controller.update(req, FAKE_UUID, body)
|
||||
|
||||
self.assertEqual(res_dict['server']['id'], FAKE_UUID)
|
||||
self.assertEqual(res_dict['server']['name'], 'server_test')
|
||||
self.assertEqual(res_dict['server']['accessIPv4'], '0.0.0.0')
|
||||
self.assertEqual(res_dict['server']['accessIPv6'], 'beef::123')
|
||||
self.assertEqual(FAKE_UUID, res_dict['server']['id'])
|
||||
self.assertEqual('server_test', res_dict['server']['name'])
|
||||
self.assertEqual('0.0.0.0', res_dict['server']['accessIPv4'])
|
||||
self.assertEqual('beef::123', res_dict['server']['accessIPv6'])
|
||||
|
||||
def test_update_server_invalid_xml_raises_lookup(self):
|
||||
body = """<?xml version="1.0" encoding="TF-8"?>
|
||||
|
|
@ -1366,7 +1366,7 @@ class ServersControllerUpdateTest(ControllerTest):
|
|||
key="Label"></meta>"""
|
||||
req = self._get_request(body, content_type='xml')
|
||||
res = req.get_response(fakes.wsgi_app())
|
||||
self.assertEqual(res.status_int, 400)
|
||||
self.assertEqual(400, res.status_int)
|
||||
|
||||
def test_update_server_invalid_xml_raises_expat(self):
|
||||
body = """<?xml version="1.0" encoding="UTF-8"?>
|
||||
|
|
@ -1375,15 +1375,15 @@ class ServersControllerUpdateTest(ControllerTest):
|
|||
key="Label"></meta>"""
|
||||
req = self._get_request(body, content_type='xml')
|
||||
res = req.get_response(fakes.wsgi_app())
|
||||
self.assertEqual(res.status_int, 400)
|
||||
self.assertEqual(400, res.status_int)
|
||||
|
||||
def test_update_server_name(self):
|
||||
body = {'server': {'name': 'server_test'}}
|
||||
req = self._get_request(body, {'name': 'server_test'})
|
||||
res_dict = self.controller.update(req, FAKE_UUID, body)
|
||||
|
||||
self.assertEqual(res_dict['server']['id'], FAKE_UUID)
|
||||
self.assertEqual(res_dict['server']['name'], 'server_test')
|
||||
self.assertEqual(FAKE_UUID, res_dict['server']['id'])
|
||||
self.assertEqual('server_test', res_dict['server']['name'])
|
||||
|
||||
def test_update_server_name_too_long(self):
|
||||
body = {'server': {'name': 'x' * 256}}
|
||||
|
|
@ -1415,7 +1415,7 @@ class ServersControllerUpdateTest(ControllerTest):
|
|||
filtered_dict = {
|
||||
'display_name': 'server_test',
|
||||
}
|
||||
self.assertEqual(params, filtered_dict)
|
||||
self.assertEqual(filtered_dict, params)
|
||||
filtered_dict['uuid'] = id
|
||||
return filtered_dict
|
||||
|
||||
|
|
@ -1430,8 +1430,8 @@ class ServersControllerUpdateTest(ControllerTest):
|
|||
req.body = jsonutils.dumps(body)
|
||||
res_dict = self.controller.update(req, FAKE_UUID, body)
|
||||
|
||||
self.assertEqual(res_dict['server']['id'], FAKE_UUID)
|
||||
self.assertEqual(res_dict['server']['name'], 'server_test')
|
||||
self.assertEqual(FAKE_UUID, res_dict['server']['id'])
|
||||
self.assertEqual('server_test', res_dict['server']['name'])
|
||||
|
||||
def test_update_server_not_found(self):
|
||||
def fake_get(*args, **kwargs):
|
||||
|
|
@ -1586,7 +1586,7 @@ class ServersControllerDeleteTest(ControllerTest):
|
|||
self.controller.delete(req, FAKE_UUID)
|
||||
# delete() should be called for instance which has never been active,
|
||||
# even if reclaim_instance_interval has been set.
|
||||
self.assertEqual(self.server_delete_called, True)
|
||||
self.assertEqual(True, self.server_delete_called)
|
||||
|
||||
|
||||
class ServersControllerRebuildInstanceTest(ControllerTest):
|
||||
|
|
@ -1753,17 +1753,17 @@ class ServerStatusTest(test.TestCase):
|
|||
|
||||
def test_active(self):
|
||||
response = self._get_with_state(vm_states.ACTIVE)
|
||||
self.assertEqual(response['server']['status'], 'ACTIVE')
|
||||
self.assertEqual('ACTIVE', response['server']['status'])
|
||||
|
||||
def test_reboot(self):
|
||||
response = self._get_with_state(vm_states.ACTIVE,
|
||||
task_states.REBOOTING)
|
||||
self.assertEqual(response['server']['status'], 'REBOOT')
|
||||
self.assertEqual('REBOOT', response['server']['status'])
|
||||
|
||||
def test_reboot_hard(self):
|
||||
response = self._get_with_state(vm_states.ACTIVE,
|
||||
task_states.REBOOTING_HARD)
|
||||
self.assertEqual(response['server']['status'], 'HARD_REBOOT')
|
||||
self.assertEqual('HARD_REBOOT', response['server']['status'])
|
||||
|
||||
@mock.patch.object(servers.Controller, "_get_server")
|
||||
def test_reboot_resize_policy_fail(self, mock_get_server):
|
||||
|
|
@ -1775,16 +1775,16 @@ class ServerStatusTest(test.TestCase):
|
|||
def test_rebuild(self):
|
||||
response = self._get_with_state(vm_states.ACTIVE,
|
||||
task_states.REBUILDING)
|
||||
self.assertEqual(response['server']['status'], 'REBUILD')
|
||||
self.assertEqual('REBUILD', response['server']['status'])
|
||||
|
||||
def test_rebuild_error(self):
|
||||
response = self._get_with_state(vm_states.ERROR)
|
||||
self.assertEqual(response['server']['status'], 'ERROR')
|
||||
self.assertEqual('ERROR', response['server']['status'])
|
||||
|
||||
def test_resize(self):
|
||||
response = self._get_with_state(vm_states.ACTIVE,
|
||||
task_states.RESIZE_PREP)
|
||||
self.assertEqual(response['server']['status'], 'RESIZE')
|
||||
self.assertEqual('RESIZE', response['server']['status'])
|
||||
|
||||
@mock.patch.object(servers.Controller, "_get_server")
|
||||
def test_confirm_resize_policy_fail(self, mock_get_server):
|
||||
|
|
@ -1794,12 +1794,12 @@ class ServerStatusTest(test.TestCase):
|
|||
|
||||
def test_verify_resize(self):
|
||||
response = self._get_with_state(vm_states.RESIZED, None)
|
||||
self.assertEqual(response['server']['status'], 'VERIFY_RESIZE')
|
||||
self.assertEqual('VERIFY_RESIZE', response['server']['status'])
|
||||
|
||||
def test_revert_resize(self):
|
||||
response = self._get_with_state(vm_states.RESIZED,
|
||||
task_states.RESIZE_REVERTING)
|
||||
self.assertEqual(response['server']['status'], 'REVERT_RESIZE')
|
||||
self.assertEqual('REVERT_RESIZE', response['server']['status'])
|
||||
|
||||
@mock.patch.object(servers.Controller, "_get_server")
|
||||
def test_revert_resize_policy_fail(self, mock_get_server):
|
||||
|
|
@ -1810,11 +1810,11 @@ class ServerStatusTest(test.TestCase):
|
|||
def test_password_update(self):
|
||||
response = self._get_with_state(vm_states.ACTIVE,
|
||||
task_states.UPDATING_PASSWORD)
|
||||
self.assertEqual(response['server']['status'], 'PASSWORD')
|
||||
self.assertEqual('PASSWORD', response['server']['status'])
|
||||
|
||||
def test_stopped(self):
|
||||
response = self._get_with_state(vm_states.STOPPED)
|
||||
self.assertEqual(response['server']['status'], 'SHUTOFF')
|
||||
self.assertEqual('SHUTOFF', response['server']['status'])
|
||||
|
||||
|
||||
class ServersControllerCreateTest(test.TestCase):
|
||||
|
|
@ -2077,8 +2077,8 @@ class ServersControllerCreateTest(test.TestCase):
|
|||
old_create = compute_api.API.create
|
||||
|
||||
def create(*args, **kwargs):
|
||||
self.assertEqual(kwargs['min_count'], 2)
|
||||
self.assertEqual(len(kwargs['block_device_mapping']), 2)
|
||||
self.assertEqual(2, kwargs['min_count'])
|
||||
self.assertEqual(2, len(kwargs['block_device_mapping']))
|
||||
return old_create(*args, **kwargs)
|
||||
|
||||
self.stubs.Set(compute_api.API, 'create', create)
|
||||
|
|
@ -2411,7 +2411,7 @@ class ServersControllerCreateTest(test.TestCase):
|
|||
res = self.controller.create(self.req, self.body).obj
|
||||
|
||||
server = res['server']
|
||||
self.assertEqual(server['adminPass'], self.body['server']['adminPass'])
|
||||
self.assertEqual(self.body['server']['adminPass'], server['adminPass'])
|
||||
|
||||
def test_create_instance_admin_pass_pass_disabled(self):
|
||||
self.flags(enable_instance_password=False)
|
||||
|
|
@ -2441,7 +2441,7 @@ class ServersControllerCreateTest(test.TestCase):
|
|||
# NOTE(vish): if the security groups extension is not
|
||||
# enabled, then security groups passed in
|
||||
# are ignored.
|
||||
self.assertEqual(kwargs['security_group'], ['default'])
|
||||
self.assertEqual(['default'], kwargs['security_group'])
|
||||
return old_create(*args, **kwargs)
|
||||
|
||||
self.stubs.Set(compute_api.API, 'create', create)
|
||||
|
|
@ -2456,7 +2456,7 @@ class ServersControllerCreateTest(test.TestCase):
|
|||
old_create = compute_api.API.create
|
||||
|
||||
def create(*args, **kwargs):
|
||||
self.assertEqual(kwargs['auto_disk_config'], 'AUTO')
|
||||
self.assertEqual('AUTO', kwargs['auto_disk_config'])
|
||||
return old_create(*args, **kwargs)
|
||||
|
||||
self.stubs.Set(compute_api.API, 'create', create)
|
||||
|
|
@ -2467,7 +2467,7 @@ class ServersControllerCreateTest(test.TestCase):
|
|||
old_create = compute_api.API.create
|
||||
|
||||
def create(*args, **kwargs):
|
||||
self.assertEqual(kwargs['auto_disk_config'], False)
|
||||
self.assertEqual(False, kwargs['auto_disk_config'])
|
||||
return old_create(*args, **kwargs)
|
||||
|
||||
self.stubs.Set(compute_api.API, 'create', create)
|
||||
|
|
@ -2480,7 +2480,7 @@ class ServersControllerCreateTest(test.TestCase):
|
|||
old_create = compute_api.API.create
|
||||
|
||||
def create(*args, **kwargs):
|
||||
self.assertEqual(kwargs['scheduler_hints'], hints)
|
||||
self.assertEqual(hints, kwargs['scheduler_hints'])
|
||||
return old_create(*args, **kwargs)
|
||||
|
||||
self.stubs.Set(compute_api.API, 'create', create)
|
||||
|
|
@ -2492,7 +2492,7 @@ class ServersControllerCreateTest(test.TestCase):
|
|||
old_create = compute_api.API.create
|
||||
|
||||
def create(*args, **kwargs):
|
||||
self.assertEqual(kwargs['scheduler_hints'], {})
|
||||
self.assertEqual({}, kwargs['scheduler_hints'])
|
||||
return old_create(*args, **kwargs)
|
||||
|
||||
self.stubs.Set(compute_api.API, 'create', create)
|
||||
|
|
@ -2532,7 +2532,7 @@ class ServersControllerCreateTest(test.TestCase):
|
|||
old_create = compute_api.API.create
|
||||
|
||||
def create(*args, **kwargs):
|
||||
self.assertEqual(kwargs['user_data'], user_data)
|
||||
self.assertEqual(user_data, kwargs['user_data'])
|
||||
return old_create(*args, **kwargs)
|
||||
|
||||
self.stubs.Set(compute_api.API, 'create', create)
|
||||
|
|
@ -2566,7 +2566,7 @@ class ServersControllerCreateTest(test.TestCase):
|
|||
name=name)
|
||||
|
||||
def create(*args, **kwargs):
|
||||
self.assertEqual(kwargs['key_name'], key_name)
|
||||
self.assertEqual(key_name, kwargs['key_name'])
|
||||
return old_create(*args, **kwargs)
|
||||
|
||||
self.stubs.Set(db, 'key_pair_get', key_pair_get)
|
||||
|
|
@ -2593,7 +2593,7 @@ class ServersControllerCreateTest(test.TestCase):
|
|||
old_create = compute_api.API.create
|
||||
|
||||
def create(*args, **kwargs):
|
||||
self.assertEqual(kwargs['availability_zone'], availability_zone)
|
||||
self.assertEqual(availability_zone, kwargs['availability_zone'])
|
||||
return old_create(*args, **kwargs)
|
||||
|
||||
self.stubs.Set(compute_api.API, 'create', create)
|
||||
|
|
@ -2602,7 +2602,7 @@ class ServersControllerCreateTest(test.TestCase):
|
|||
self._test_create_extra(params)
|
||||
except webob.exc.HTTPBadRequest as e:
|
||||
expected = 'The requested availability zone is not available'
|
||||
self.assertEqual(e.explanation, expected)
|
||||
self.assertEqual(expected, e.explanation)
|
||||
admin_context = context.get_admin_context()
|
||||
db.service_create(admin_context, {'host': 'host1_zones',
|
||||
'binary': "nova-compute",
|
||||
|
|
@ -2771,7 +2771,7 @@ class ServersControllerCreateTest(test.TestCase):
|
|||
self.body['server']['imageRef'] = image_href
|
||||
self.req.body = jsonutils.dumps(self.body)
|
||||
robj = self.controller.create(self.req, self.body)
|
||||
self.assertEqual(robj['Location'], selfhref)
|
||||
self.assertEqual(selfhref, robj['Location'])
|
||||
|
||||
def _do_test_create_instance_above_quota(self, resource, allowed, quota,
|
||||
expected_msg):
|
||||
|
|
@ -2782,7 +2782,7 @@ class ServersControllerCreateTest(test.TestCase):
|
|||
self.controller.create(self.req, self.body).obj['server']
|
||||
self.fail('expected quota to be exceeded')
|
||||
except webob.exc.HTTPForbidden as e:
|
||||
self.assertEqual(e.explanation, expected_msg)
|
||||
self.assertEqual(expected_msg, e.explanation)
|
||||
|
||||
def test_create_instance_above_quota_instances(self):
|
||||
msg = ('Quota exceeded for instances: Requested 1, but'
|
||||
|
|
@ -2805,10 +2805,10 @@ class ServersControllerCreateTest(test.TestCase):
|
|||
fake_group.create()
|
||||
|
||||
def fake_count(context, name, group, user_id):
|
||||
self.assertEqual(name, "server_group_members")
|
||||
self.assertEqual(group.uuid, fake_group.uuid)
|
||||
self.assertEqual(user_id,
|
||||
self.req.environ['nova.context'].user_id)
|
||||
self.assertEqual("server_group_members", name)
|
||||
self.assertEqual(fake_group.uuid, group.uuid)
|
||||
self.assertEqual(self.req.environ['nova.context'].user_id,
|
||||
user_id)
|
||||
return 10
|
||||
|
||||
def fake_limit_check(context, **kwargs):
|
||||
|
|
@ -2832,7 +2832,7 @@ class ServersControllerCreateTest(test.TestCase):
|
|||
self.controller.create(self.req, self.body).obj['server']
|
||||
self.fail('expected quota to be exceeded')
|
||||
except webob.exc.HTTPForbidden as e:
|
||||
self.assertEqual(e.explanation, expected_msg)
|
||||
self.assertEqual(expected_msg, e.explanation)
|
||||
|
||||
def test_create_instance_with_group_hint(self):
|
||||
ctxt = context.get_admin_context()
|
||||
|
|
@ -2869,7 +2869,7 @@ class ServersControllerCreateTest(test.TestCase):
|
|||
for test_list in [list1, list2, list3, list4]:
|
||||
result = self.controller._resolve_exception(test_list)
|
||||
# Since CC is the most specific, we always expect that returned.
|
||||
self.assertEqual(result, CC)
|
||||
self.assertEqual(CC, result)
|
||||
|
||||
|
||||
class ServersControllerCreateTestWithMock(test.TestCase):
|
||||
|
|
@ -2950,8 +2950,8 @@ class ServersControllerCreateTestWithMock(test.TestCase):
|
|||
self._test_create_extra(params)
|
||||
self.fail()
|
||||
except webob.exc.HTTPBadRequest as ex:
|
||||
self.assertEqual(ex.explanation,
|
||||
'Invalid fixed IP address (%s)' % address)
|
||||
self.assertEqual('Invalid fixed IP address (%s)' % address,
|
||||
ex.explanation)
|
||||
self.assertFalse(create_mock.called)
|
||||
|
||||
@mock.patch.object(compute_api.API, 'create',
|
||||
|
|
@ -3073,7 +3073,7 @@ class ServersViewBuilderTest(test.TestCase):
|
|||
"links": [{"rel": "bookmark",
|
||||
"href": self.flavor_bookmark}]}
|
||||
result = self.view_builder._get_flavor(self.request, self.instance)
|
||||
self.assertEqual(result, expected)
|
||||
self.assertEqual(expected, result)
|
||||
|
||||
def test_build_server(self):
|
||||
output = self.view_builder.basic(self.request, self.instance)
|
||||
|
|
@ -3095,7 +3095,7 @@ class ServersViewBuilderTest(test.TestCase):
|
|||
def test_build_server_no_image(self):
|
||||
self.instance["image_ref"] = ""
|
||||
output = self.view_builder.show(self.request, self.instance)
|
||||
self.assertEqual(output['server']['image'], "")
|
||||
self.assertEqual("", output['server']['image'])
|
||||
|
||||
def test_build_server_detail_with_fault(self):
|
||||
self.instance['vm_state'] = vm_states.ERROR
|
||||
|
|
|
|||
|
|
@ -223,7 +223,7 @@ class CellsManagerClassTestCase(test.NoDBTestCase):
|
|||
instances = ['instance1', 'instance2', 'instance3']
|
||||
|
||||
def get_instances_to_sync(context, **kwargs):
|
||||
self.assertEqual(context, fake_context)
|
||||
self.assertEqual(fake_context, context)
|
||||
call_info['shuffle'] = kwargs.get('shuffle')
|
||||
call_info['project_id'] = kwargs.get('project_id')
|
||||
call_info['updated_since'] = kwargs.get('updated_since')
|
||||
|
|
@ -235,7 +235,7 @@ class CellsManagerClassTestCase(test.NoDBTestCase):
|
|||
return instances[int(uuid[-1]) - 1]
|
||||
|
||||
def sync_instance(context, instance):
|
||||
self.assertEqual(context, fake_context)
|
||||
self.assertEqual(fake_context, context)
|
||||
call_info['sync_instances'].append(instance)
|
||||
|
||||
self.stubs.Set(cells_utils, 'get_instances_to_sync',
|
||||
|
|
@ -247,23 +247,22 @@ class CellsManagerClassTestCase(test.NoDBTestCase):
|
|||
self.stubs.Set(timeutils, 'utcnow', utcnow)
|
||||
|
||||
self.cells_manager._heal_instances(fake_context)
|
||||
self.assertEqual(call_info['shuffle'], True)
|
||||
self.assertEqual(True, call_info['shuffle'])
|
||||
self.assertIsNone(call_info['project_id'])
|
||||
self.assertEqual(call_info['updated_since'], updated_since)
|
||||
self.assertEqual(call_info['get_instances'], 1)
|
||||
self.assertEqual(updated_since, call_info['updated_since'])
|
||||
self.assertEqual(1, call_info['get_instances'])
|
||||
# Only first 2
|
||||
self.assertEqual(call_info['sync_instances'],
|
||||
instances[:2])
|
||||
self.assertEqual(instances[:2], call_info['sync_instances'])
|
||||
|
||||
call_info['sync_instances'] = []
|
||||
self.cells_manager._heal_instances(fake_context)
|
||||
self.assertEqual(call_info['shuffle'], True)
|
||||
self.assertEqual(True, call_info['shuffle'])
|
||||
self.assertIsNone(call_info['project_id'])
|
||||
self.assertEqual(call_info['updated_since'], updated_since)
|
||||
self.assertEqual(call_info['get_instances'], 2)
|
||||
self.assertEqual(updated_since, call_info['updated_since'])
|
||||
self.assertEqual(2, call_info['get_instances'])
|
||||
# Now the last 1 and the first 1
|
||||
self.assertEqual(call_info['sync_instances'],
|
||||
[instances[-1], instances[0]])
|
||||
self.assertEqual([instances[-1], instances[0]],
|
||||
call_info['sync_instances'])
|
||||
|
||||
def test_sync_instances(self):
|
||||
self.mox.StubOutWithMock(self.msg_runner,
|
||||
|
|
|
|||
|
|
@ -63,7 +63,7 @@ class CellsMessageClassesTestCase(test.TestCase):
|
|||
path = 'a!b!c!d'
|
||||
expected = 'd!c!b!a'
|
||||
rev_path = messaging._reverse_path(path)
|
||||
self.assertEqual(rev_path, expected)
|
||||
self.assertEqual(expected, rev_path)
|
||||
|
||||
def test_response_cell_name_from_path(self):
|
||||
# test array with tuples of inputs/expected outputs
|
||||
|
|
@ -381,7 +381,7 @@ class CellsMessageClassesTestCase(test.TestCase):
|
|||
self.assertEqual(method_kwargs, call_info['kwargs'])
|
||||
self.assertEqual(target_cell, call_info['routing_path'])
|
||||
self.assertFalse(response.failure)
|
||||
self.assertEqual(response.value_or_raise(), 'our_fake_response')
|
||||
self.assertEqual('our_fake_response', response.value_or_raise())
|
||||
|
||||
def test_grandchild_targeted_message_with_error(self):
|
||||
target_cell = 'api-cell!child-cell2!grandchild-cell1'
|
||||
|
|
@ -488,7 +488,7 @@ class CellsMessageClassesTestCase(test.TestCase):
|
|||
run_locally=True)
|
||||
bcast_message.process()
|
||||
# fakes creates 8 cells (including ourself).
|
||||
self.assertEqual(len(cells), 8)
|
||||
self.assertEqual(8, len(cells))
|
||||
|
||||
def test_broadcast_routing_up(self):
|
||||
method = 'our_fake_method'
|
||||
|
|
@ -533,7 +533,7 @@ class CellsMessageClassesTestCase(test.TestCase):
|
|||
bcast_message.process()
|
||||
# fakes creates 8 cells (including ourself). So we should see
|
||||
# only 7 here.
|
||||
self.assertEqual(len(cells), 7)
|
||||
self.assertEqual(7, len(cells))
|
||||
|
||||
def test_broadcast_routing_with_response(self):
|
||||
method = 'our_fake_method'
|
||||
|
|
@ -552,7 +552,7 @@ class CellsMessageClassesTestCase(test.TestCase):
|
|||
run_locally=True,
|
||||
need_response=True)
|
||||
responses = bcast_message.process()
|
||||
self.assertEqual(len(responses), 8)
|
||||
self.assertEqual(8, len(responses))
|
||||
for response in responses:
|
||||
self.assertFalse(response.failure)
|
||||
self.assertEqual('response-%s' % response.cell_name,
|
||||
|
|
@ -578,7 +578,7 @@ class CellsMessageClassesTestCase(test.TestCase):
|
|||
responses = bcast_message.process()
|
||||
# Should only get responses from our immediate children (and
|
||||
# ourselves)
|
||||
self.assertEqual(len(responses), 5)
|
||||
self.assertEqual(5, len(responses))
|
||||
for response in responses:
|
||||
self.assertFalse(response.failure)
|
||||
self.assertEqual('response-%s' % response.cell_name,
|
||||
|
|
@ -601,7 +601,7 @@ class CellsMessageClassesTestCase(test.TestCase):
|
|||
run_locally=True,
|
||||
need_response=True)
|
||||
responses = bcast_message.process()
|
||||
self.assertEqual(len(responses), 8)
|
||||
self.assertEqual(8, len(responses))
|
||||
for response in responses:
|
||||
self.assertTrue(response.failure)
|
||||
self.assertRaises(test.TestingException, response.value_or_raise)
|
||||
|
|
@ -630,11 +630,11 @@ class CellsMessageClassesTestCase(test.TestCase):
|
|||
run_locally=True,
|
||||
need_response=True)
|
||||
responses = bcast_message.process()
|
||||
self.assertEqual(len(responses), 8)
|
||||
self.assertEqual(8, len(responses))
|
||||
failure_responses = [resp for resp in responses if resp.failure]
|
||||
success_responses = [resp for resp in responses if not resp.failure]
|
||||
self.assertEqual(len(failure_responses), 2)
|
||||
self.assertEqual(len(success_responses), 6)
|
||||
self.assertEqual(2, len(failure_responses))
|
||||
self.assertEqual(6, len(success_responses))
|
||||
|
||||
for response in success_responses:
|
||||
self.assertFalse(response.failure)
|
||||
|
|
|
|||
|
|
@ -65,8 +65,8 @@ class CellsAPITestCase(test.NoDBTestCase):
|
|||
return call_info
|
||||
|
||||
def _check_result(self, call_info, method, args, version=None):
|
||||
self.assertEqual(self.cells_rpcapi.client.target.topic,
|
||||
self.fake_topic)
|
||||
self.assertEqual(self.fake_topic,
|
||||
self.cells_rpcapi.client.target.topic)
|
||||
self.assertEqual(self.fake_context, call_info['context'])
|
||||
self.assertEqual(method, call_info['method'])
|
||||
self.assertEqual(args, call_info['args'])
|
||||
|
|
@ -240,7 +240,7 @@ class CellsAPITestCase(test.NoDBTestCase):
|
|||
self.fake_context)
|
||||
self._check_result(call_info, 'get_cell_info_for_neighbors', {},
|
||||
version='1.1')
|
||||
self.assertEqual(result, 'fake_response')
|
||||
self.assertEqual('fake_response', result)
|
||||
|
||||
def test_sync_instances(self):
|
||||
call_info = self._stub_rpc_method('cast', None)
|
||||
|
|
@ -263,7 +263,7 @@ class CellsAPITestCase(test.NoDBTestCase):
|
|||
expected_args = {'filters': fake_filters}
|
||||
self._check_result(call_info, 'service_get_all', expected_args,
|
||||
version='1.2')
|
||||
self.assertEqual(result, 'fake_response')
|
||||
self.assertEqual('fake_response', result)
|
||||
|
||||
def test_service_get_by_compute_host(self):
|
||||
call_info = self._stub_rpc_method('call', 'fake_response')
|
||||
|
|
@ -273,7 +273,7 @@ class CellsAPITestCase(test.NoDBTestCase):
|
|||
self._check_result(call_info, 'service_get_by_compute_host',
|
||||
expected_args,
|
||||
version='1.2')
|
||||
self.assertEqual(result, 'fake_response')
|
||||
self.assertEqual('fake_response', result)
|
||||
|
||||
def test_get_host_uptime(self):
|
||||
call_info = self._stub_rpc_method('call', 'fake_response')
|
||||
|
|
@ -283,7 +283,7 @@ class CellsAPITestCase(test.NoDBTestCase):
|
|||
self._check_result(call_info, 'get_host_uptime',
|
||||
expected_args,
|
||||
version='1.17')
|
||||
self.assertEqual(result, 'fake_response')
|
||||
self.assertEqual('fake_response', result)
|
||||
|
||||
def test_service_update(self):
|
||||
call_info = self._stub_rpc_method('call', 'fake_response')
|
||||
|
|
@ -297,7 +297,7 @@ class CellsAPITestCase(test.NoDBTestCase):
|
|||
self._check_result(call_info, 'service_update',
|
||||
expected_args,
|
||||
version='1.7')
|
||||
self.assertEqual(result, 'fake_response')
|
||||
self.assertEqual('fake_response', result)
|
||||
|
||||
def test_service_delete(self):
|
||||
call_info = self._stub_rpc_method('call', None)
|
||||
|
|
@ -321,7 +321,7 @@ class CellsAPITestCase(test.NoDBTestCase):
|
|||
self._check_result(call_info, 'proxy_rpc_to_manager',
|
||||
expected_args,
|
||||
version='1.2')
|
||||
self.assertEqual(result, 'fake_response')
|
||||
self.assertEqual('fake_response', result)
|
||||
|
||||
def test_task_log_get_all(self):
|
||||
call_info = self._stub_rpc_method('call', 'fake_response')
|
||||
|
|
@ -339,7 +339,7 @@ class CellsAPITestCase(test.NoDBTestCase):
|
|||
'state': 'fake_state'}
|
||||
self._check_result(call_info, 'task_log_get_all', expected_args,
|
||||
version='1.3')
|
||||
self.assertEqual(result, 'fake_response')
|
||||
self.assertEqual('fake_response', result)
|
||||
|
||||
def test_compute_node_get_all(self):
|
||||
call_info = self._stub_rpc_method('call', 'fake_response')
|
||||
|
|
@ -349,7 +349,7 @@ class CellsAPITestCase(test.NoDBTestCase):
|
|||
expected_args = {'hypervisor_match': 'fake-match'}
|
||||
self._check_result(call_info, 'compute_node_get_all', expected_args,
|
||||
version='1.4')
|
||||
self.assertEqual(result, 'fake_response')
|
||||
self.assertEqual('fake_response', result)
|
||||
|
||||
def test_compute_node_stats(self):
|
||||
call_info = self._stub_rpc_method('call', 'fake_response')
|
||||
|
|
@ -357,7 +357,7 @@ class CellsAPITestCase(test.NoDBTestCase):
|
|||
expected_args = {}
|
||||
self._check_result(call_info, 'compute_node_stats',
|
||||
expected_args, version='1.4')
|
||||
self.assertEqual(result, 'fake_response')
|
||||
self.assertEqual('fake_response', result)
|
||||
|
||||
def test_compute_node_get(self):
|
||||
call_info = self._stub_rpc_method('call', 'fake_response')
|
||||
|
|
@ -366,7 +366,7 @@ class CellsAPITestCase(test.NoDBTestCase):
|
|||
expected_args = {'compute_id': 'fake_compute_id'}
|
||||
self._check_result(call_info, 'compute_node_get',
|
||||
expected_args, version='1.4')
|
||||
self.assertEqual(result, 'fake_response')
|
||||
self.assertEqual('fake_response', result)
|
||||
|
||||
def test_actions_get(self):
|
||||
fake_instance = {'uuid': 'fake-uuid', 'cell_name': 'region!child'}
|
||||
|
|
@ -377,7 +377,7 @@ class CellsAPITestCase(test.NoDBTestCase):
|
|||
'instance_uuid': fake_instance['uuid']}
|
||||
self._check_result(call_info, 'actions_get', expected_args,
|
||||
version='1.5')
|
||||
self.assertEqual(result, 'fake_response')
|
||||
self.assertEqual('fake_response', result)
|
||||
|
||||
def test_actions_get_no_cell(self):
|
||||
fake_instance = {'uuid': 'fake-uuid', 'cell_name': None}
|
||||
|
|
@ -396,7 +396,7 @@ class CellsAPITestCase(test.NoDBTestCase):
|
|||
'request_id': 'req-fake'}
|
||||
self._check_result(call_info, 'action_get_by_request_id',
|
||||
expected_args, version='1.5')
|
||||
self.assertEqual(result, 'fake_response')
|
||||
self.assertEqual('fake_response', result)
|
||||
|
||||
def test_action_get_by_request_id_no_cell(self):
|
||||
fake_instance = {'uuid': 'fake-uuid', 'cell_name': None}
|
||||
|
|
@ -414,7 +414,7 @@ class CellsAPITestCase(test.NoDBTestCase):
|
|||
'action_id': 'fake-action'}
|
||||
self._check_result(call_info, 'action_events_get', expected_args,
|
||||
version='1.5')
|
||||
self.assertEqual(result, 'fake_response')
|
||||
self.assertEqual('fake_response', result)
|
||||
|
||||
def test_action_events_get_no_cell(self):
|
||||
fake_instance = {'uuid': 'fake-uuid', 'cell_name': None}
|
||||
|
|
@ -443,7 +443,7 @@ class CellsAPITestCase(test.NoDBTestCase):
|
|||
'console_type': 'fake-type'}
|
||||
self._check_result(call_info, 'validate_console_port',
|
||||
expected_args, version='1.6')
|
||||
self.assertEqual(result, 'fake_response')
|
||||
self.assertEqual('fake_response', result)
|
||||
|
||||
def test_bdm_update_or_create_at_top(self):
|
||||
fake_bdm = {'id': 2, 'other': 'meow'}
|
||||
|
|
@ -532,7 +532,7 @@ class CellsAPITestCase(test.NoDBTestCase):
|
|||
'clean_shutdown': True}
|
||||
self._check_result(call_info, 'stop_instance',
|
||||
expected_args, version='1.31')
|
||||
self.assertEqual(result, 'fake_response')
|
||||
self.assertEqual('fake_response', result)
|
||||
|
||||
def test_cell_create(self):
|
||||
call_info = self._stub_rpc_method('call', 'fake_response')
|
||||
|
|
@ -542,7 +542,7 @@ class CellsAPITestCase(test.NoDBTestCase):
|
|||
expected_args = {'values': 'values'}
|
||||
self._check_result(call_info, 'cell_create',
|
||||
expected_args, version='1.13')
|
||||
self.assertEqual(result, 'fake_response')
|
||||
self.assertEqual('fake_response', result)
|
||||
|
||||
def test_cell_update(self):
|
||||
call_info = self._stub_rpc_method('call', 'fake_response')
|
||||
|
|
@ -554,7 +554,7 @@ class CellsAPITestCase(test.NoDBTestCase):
|
|||
'values': 'values'}
|
||||
self._check_result(call_info, 'cell_update',
|
||||
expected_args, version='1.13')
|
||||
self.assertEqual(result, 'fake_response')
|
||||
self.assertEqual('fake_response', result)
|
||||
|
||||
def test_cell_delete(self):
|
||||
call_info = self._stub_rpc_method('call', 'fake_response')
|
||||
|
|
@ -565,7 +565,7 @@ class CellsAPITestCase(test.NoDBTestCase):
|
|||
expected_args = {'cell_name': 'cell_name'}
|
||||
self._check_result(call_info, 'cell_delete',
|
||||
expected_args, version='1.13')
|
||||
self.assertEqual(result, 'fake_response')
|
||||
self.assertEqual('fake_response', result)
|
||||
|
||||
def test_cell_get(self):
|
||||
call_info = self._stub_rpc_method('call', 'fake_response')
|
||||
|
|
@ -576,7 +576,7 @@ class CellsAPITestCase(test.NoDBTestCase):
|
|||
expected_args = {'cell_name': 'cell_name'}
|
||||
self._check_result(call_info, 'cell_get',
|
||||
expected_args, version='1.13')
|
||||
self.assertEqual(result, 'fake_response')
|
||||
self.assertEqual('fake_response', result)
|
||||
|
||||
def test_reboot_instance(self):
|
||||
call_info = self._stub_rpc_method('cast', None)
|
||||
|
|
|
|||
|
|
@ -239,7 +239,7 @@ class TestCellStateManagerException(test.NoDBTestCase):
|
|||
super(TestCellStateManagerDB, self).__init__()
|
||||
test = TestCellStateManagerDB()
|
||||
mock_sleep.assert_called_once_with(30)
|
||||
self.assertEqual(test._cell_data_sync.call_count, 2)
|
||||
self.assertEqual(2, test._cell_data_sync.call_count)
|
||||
|
||||
|
||||
class TestCellsGetCapacity(TestCellsStateManager):
|
||||
|
|
@ -291,28 +291,28 @@ class TestSyncDecorators(test.NoDBTestCase):
|
|||
manager = FakeCellStateManager()
|
||||
|
||||
def test(inst, *args, **kwargs):
|
||||
self.assertEqual(inst, manager)
|
||||
self.assertEqual(args, (1, 2, 3))
|
||||
self.assertEqual(kwargs, dict(a=4, b=5, c=6))
|
||||
self.assertEqual(manager, inst)
|
||||
self.assertEqual((1, 2, 3), args)
|
||||
self.assertEqual(dict(a=4, b=5, c=6), kwargs)
|
||||
return 'result'
|
||||
wrapper = state.sync_before(test)
|
||||
|
||||
result = wrapper(manager, 1, 2, 3, a=4, b=5, c=6)
|
||||
|
||||
self.assertEqual(result, 'result')
|
||||
self.assertEqual(manager.called, [('_cell_data_sync', False)])
|
||||
self.assertEqual('result', result)
|
||||
self.assertEqual([('_cell_data_sync', False)], manager.called)
|
||||
|
||||
def test_sync_after(self):
|
||||
manager = FakeCellStateManager()
|
||||
|
||||
def test(inst, *args, **kwargs):
|
||||
self.assertEqual(inst, manager)
|
||||
self.assertEqual(args, (1, 2, 3))
|
||||
self.assertEqual(kwargs, dict(a=4, b=5, c=6))
|
||||
self.assertEqual(manager, inst)
|
||||
self.assertEqual((1, 2, 3), args)
|
||||
self.assertEqual(dict(a=4, b=5, c=6), kwargs)
|
||||
return 'result'
|
||||
wrapper = state.sync_after(test)
|
||||
|
||||
result = wrapper(manager, 1, 2, 3, a=4, b=5, c=6)
|
||||
|
||||
self.assertEqual(result, 'result')
|
||||
self.assertEqual(manager.called, [('_cell_data_sync', True)])
|
||||
self.assertEqual('result', result)
|
||||
self.assertEqual([('_cell_data_sync', True)], manager.called)
|
||||
|
|
|
|||
|
|
@ -38,9 +38,9 @@ class CellsUtilsTestCase(test.NoDBTestCase):
|
|||
@staticmethod
|
||||
def instance_get_all_by_filters(context, filters,
|
||||
sort_key, sort_dir):
|
||||
self.assertEqual(context, fake_context)
|
||||
self.assertEqual(sort_key, 'deleted')
|
||||
self.assertEqual(sort_dir, 'asc')
|
||||
self.assertEqual(fake_context, context)
|
||||
self.assertEqual('deleted', sort_key)
|
||||
self.assertEqual('asc', sort_dir)
|
||||
call_info['got_filters'] = filters
|
||||
call_info['get_all'] += 1
|
||||
return ['fake_instance1', 'fake_instance2', 'fake_instance3']
|
||||
|
|
@ -51,38 +51,37 @@ class CellsUtilsTestCase(test.NoDBTestCase):
|
|||
|
||||
instances = cells_utils.get_instances_to_sync(fake_context)
|
||||
self.assertTrue(inspect.isgenerator(instances))
|
||||
self.assertEqual(len([x for x in instances]), 3)
|
||||
self.assertEqual(call_info['get_all'], 1)
|
||||
self.assertEqual(call_info['got_filters'], {})
|
||||
self.assertEqual(call_info['shuffle'], 0)
|
||||
self.assertEqual(3, len([x for x in instances]))
|
||||
self.assertEqual(1, call_info['get_all'])
|
||||
self.assertEqual({}, call_info['got_filters'])
|
||||
self.assertEqual(0, call_info['shuffle'])
|
||||
|
||||
instances = cells_utils.get_instances_to_sync(fake_context,
|
||||
shuffle=True)
|
||||
self.assertTrue(inspect.isgenerator(instances))
|
||||
self.assertEqual(len([x for x in instances]), 3)
|
||||
self.assertEqual(call_info['get_all'], 2)
|
||||
self.assertEqual(call_info['got_filters'], {})
|
||||
self.assertEqual(call_info['shuffle'], 1)
|
||||
self.assertEqual(3, len([x for x in instances]))
|
||||
self.assertEqual(2, call_info['get_all'])
|
||||
self.assertEqual({}, call_info['got_filters'])
|
||||
self.assertEqual(1, call_info['shuffle'])
|
||||
|
||||
instances = cells_utils.get_instances_to_sync(fake_context,
|
||||
updated_since='fake-updated-since')
|
||||
self.assertTrue(inspect.isgenerator(instances))
|
||||
self.assertEqual(len([x for x in instances]), 3)
|
||||
self.assertEqual(call_info['get_all'], 3)
|
||||
self.assertEqual(call_info['got_filters'],
|
||||
{'changes-since': 'fake-updated-since'})
|
||||
self.assertEqual(call_info['shuffle'], 1)
|
||||
self.assertEqual(3, len([x for x in instances]))
|
||||
self.assertEqual(3, call_info['get_all'])
|
||||
self.assertEqual({'changes-since': 'fake-updated-since'},
|
||||
call_info['got_filters'])
|
||||
self.assertEqual(1, call_info['shuffle'])
|
||||
|
||||
instances = cells_utils.get_instances_to_sync(fake_context,
|
||||
project_id='fake-project',
|
||||
updated_since='fake-updated-since', shuffle=True)
|
||||
self.assertTrue(inspect.isgenerator(instances))
|
||||
self.assertEqual(len([x for x in instances]), 3)
|
||||
self.assertEqual(call_info['get_all'], 4)
|
||||
self.assertEqual(call_info['got_filters'],
|
||||
{'changes-since': 'fake-updated-since',
|
||||
'project_id': 'fake-project'})
|
||||
self.assertEqual(call_info['shuffle'], 2)
|
||||
self.assertEqual(3, len([x for x in instances]))
|
||||
self.assertEqual(4, call_info['get_all'])
|
||||
self.assertEqual({'changes-since': 'fake-updated-since',
|
||||
'project_id': 'fake-project'}, call_info['got_filters'])
|
||||
self.assertEqual(2, call_info['shuffle'])
|
||||
|
||||
def test_split_cell_and_item(self):
|
||||
path = 'australia', 'queensland', 'gold_coast'
|
||||
|
|
|
|||
|
|
@ -99,7 +99,7 @@ class RAMByInstanceTypeWeigherTestClass(_WeigherTestClass):
|
|||
instance_type = {'memory_mb': 512}
|
||||
weight_properties = {'request_spec': {'instance_type': instance_type}}
|
||||
weighed_cells = self._get_weighed_cells(cells, weight_properties)
|
||||
self.assertEqual(len(weighed_cells), 4)
|
||||
self.assertEqual(4, len(weighed_cells))
|
||||
resulting_cells = [weighed_cell.obj for weighed_cell in weighed_cells]
|
||||
expected_cells = [cells[3], cells[2], cells[1], cells[0]]
|
||||
self.assertEqual(expected_cells, resulting_cells)
|
||||
|
|
@ -108,7 +108,7 @@ class RAMByInstanceTypeWeigherTestClass(_WeigherTestClass):
|
|||
instance_type = {'memory_mb': 1024}
|
||||
weight_properties = {'request_spec': {'instance_type': instance_type}}
|
||||
weighed_cells = self._get_weighed_cells(cells, weight_properties)
|
||||
self.assertEqual(len(weighed_cells), 4)
|
||||
self.assertEqual(4, len(weighed_cells))
|
||||
resulting_cells = [weighed_cell.obj for weighed_cell in weighed_cells]
|
||||
expected_cells = [cells[0], cells[1], cells[2], cells[3]]
|
||||
self.assertEqual(expected_cells, resulting_cells)
|
||||
|
|
@ -117,7 +117,7 @@ class RAMByInstanceTypeWeigherTestClass(_WeigherTestClass):
|
|||
instance_type = {'memory_mb': 2048}
|
||||
weight_properties = {'request_spec': {'instance_type': instance_type}}
|
||||
weighed_cells = self._get_weighed_cells(cells, weight_properties)
|
||||
self.assertEqual(len(weighed_cells), 4)
|
||||
self.assertEqual(4, len(weighed_cells))
|
||||
resulting_cells = [weighed_cell.obj for weighed_cell in weighed_cells]
|
||||
expected_cells = [cells[1], cells[0], cells[3], cells[2]]
|
||||
self.assertEqual(expected_cells, resulting_cells)
|
||||
|
|
@ -130,7 +130,7 @@ class RAMByInstanceTypeWeigherTestClass(_WeigherTestClass):
|
|||
instance_type = {'memory_mb': 512}
|
||||
weight_properties = {'request_spec': {'instance_type': instance_type}}
|
||||
weighed_cells = self._get_weighed_cells(cells, weight_properties)
|
||||
self.assertEqual(len(weighed_cells), 4)
|
||||
self.assertEqual(4, len(weighed_cells))
|
||||
resulting_cells = [weighed_cell.obj for weighed_cell in weighed_cells]
|
||||
expected_cells = [cells[0], cells[1], cells[2], cells[3]]
|
||||
self.assertEqual(expected_cells, resulting_cells)
|
||||
|
|
@ -139,7 +139,7 @@ class RAMByInstanceTypeWeigherTestClass(_WeigherTestClass):
|
|||
instance_type = {'memory_mb': 1024}
|
||||
weight_properties = {'request_spec': {'instance_type': instance_type}}
|
||||
weighed_cells = self._get_weighed_cells(cells, weight_properties)
|
||||
self.assertEqual(len(weighed_cells), 4)
|
||||
self.assertEqual(4, len(weighed_cells))
|
||||
resulting_cells = [weighed_cell.obj for weighed_cell in weighed_cells]
|
||||
expected_cells = [cells[3], cells[2], cells[1], cells[0]]
|
||||
self.assertEqual(expected_cells, resulting_cells)
|
||||
|
|
@ -148,7 +148,7 @@ class RAMByInstanceTypeWeigherTestClass(_WeigherTestClass):
|
|||
instance_type = {'memory_mb': 2048}
|
||||
weight_properties = {'request_spec': {'instance_type': instance_type}}
|
||||
weighed_cells = self._get_weighed_cells(cells, weight_properties)
|
||||
self.assertEqual(len(weighed_cells), 4)
|
||||
self.assertEqual(4, len(weighed_cells))
|
||||
resulting_cells = [weighed_cell.obj for weighed_cell in weighed_cells]
|
||||
expected_cells = [cells[2], cells[3], cells[0], cells[1]]
|
||||
self.assertEqual(expected_cells, resulting_cells)
|
||||
|
|
@ -164,7 +164,7 @@ class WeightOffsetWeigherTestClass(_WeigherTestClass):
|
|||
"""
|
||||
cells = _get_fake_cells()
|
||||
weighed_cells = self._get_weighed_cells(cells, {})
|
||||
self.assertEqual(len(weighed_cells), 4)
|
||||
self.assertEqual(4, len(weighed_cells))
|
||||
expected_cells = [cells[2], cells[3], cells[0], cells[1]]
|
||||
resulting_cells = [weighed_cell.obj for weighed_cell in weighed_cells]
|
||||
self.assertEqual(expected_cells, resulting_cells)
|
||||
|
|
@ -192,7 +192,7 @@ class MuteWeigherTestClass(_WeigherTestClass):
|
|||
def test_non_mute(self):
|
||||
weight_properties = {}
|
||||
weighed_cells = self._get_weighed_cells(self.cells, weight_properties)
|
||||
self.assertEqual(len(weighed_cells), 4)
|
||||
self.assertEqual(4, len(weighed_cells))
|
||||
|
||||
for weighed_cell in weighed_cells:
|
||||
self.assertEqual(0, weighed_cell.weight)
|
||||
|
|
@ -206,7 +206,7 @@ class MuteWeigherTestClass(_WeigherTestClass):
|
|||
|
||||
weight_properties = {}
|
||||
weighed_cells = self._get_weighed_cells(self.cells, weight_properties)
|
||||
self.assertEqual(len(weighed_cells), 4)
|
||||
self.assertEqual(4, len(weighed_cells))
|
||||
|
||||
for i in range(2):
|
||||
weighed_cell = weighed_cells.pop(0)
|
||||
|
|
|
|||
|
|
@ -34,7 +34,7 @@ class CertRpcAPITestCase(test.NoDBTestCase):
|
|||
|
||||
rpcapi = cert_rpcapi.CertAPI()
|
||||
self.assertIsNotNone(rpcapi.client)
|
||||
self.assertEqual(rpcapi.client.target.topic, CONF.cert_topic)
|
||||
self.assertEqual(CONF.cert_topic, rpcapi.client.target.topic)
|
||||
|
||||
orig_prepare = rpcapi.client.prepare
|
||||
|
||||
|
|
@ -51,7 +51,7 @@ class CertRpcAPITestCase(test.NoDBTestCase):
|
|||
lambda v: orig_prepare().can_send_version())
|
||||
|
||||
retval = getattr(rpcapi, method)(ctxt, **kwargs)
|
||||
self.assertEqual(retval, rpc_mock.return_value)
|
||||
self.assertEqual(rpc_mock.return_value, retval)
|
||||
|
||||
prepare_mock.assert_called_once_with()
|
||||
rpc_mock.assert_called_once_with(ctxt, method, **kwargs)
|
||||
|
|
|
|||
Loading…
Reference in New Issue