From fc69f038bb3dca554475bbdd6844996d2d07a23e Mon Sep 17 00:00:00 2001 From: Zhongyue Luo Date: Mon, 6 Feb 2012 09:50:06 +0800 Subject: Backslash continuations (nova.tests) Fixes bug #925285 Backslash continuations removal for package nova.tests Change-Id: I089dfb9a06a807e58ebb21329800a4eff40ed2bb --- .../openstack/compute/contrib/test_aggregates.py | 6 +- .../compute/contrib/test_createserverext.py | 96 +++++++------- .../api/openstack/compute/contrib/test_vsa.py | 36 +++--- nova/tests/api/openstack/compute/test_flavors.py | 4 +- nova/tests/api/openstack/compute/test_limits.py | 4 +- nova/tests/api/openstack/compute/test_servers.py | 12 +- nova/tests/api/openstack/fakes.py | 4 +- nova/tests/api/openstack/test_wsgi.py | 4 +- nova/tests/baremetal/test_proxy_bare_metal.py | 18 +-- nova/tests/baremetal/test_tilera.py | 51 ++++---- nova/tests/db/fakes.py | 19 ++- nova/tests/scheduler/test_vsa_scheduler.py | 38 +++--- nova/tests/test_api.py | 4 +- nova/tests/test_compute.py | 31 ++--- nova/tests/test_direct.py | 4 +- nova/tests/test_instance_types.py | 4 +- nova/tests/test_iptables_network.py | 8 +- nova/tests/test_iscsi.py | 36 +++--- nova/tests/test_libvirt.py | 40 +++--- nova/tests/test_linux_net.py | 142 +++++++++------------ nova/tests/test_log.py | 5 +- nova/tests/test_network.py | 21 ++- nova/tests/test_nova_manage.py | 6 +- nova/tests/test_quantum.py | 8 +- nova/tests/test_quota.py | 4 +- nova/tests/test_volume_types.py | 3 +- nova/tests/test_xenapi.py | 29 ++--- nova/tests/xenapi/stubs.py | 16 +-- 28 files changed, 319 insertions(+), 334 deletions(-) diff --git a/nova/tests/api/openstack/compute/contrib/test_aggregates.py b/nova/tests/api/openstack/compute/contrib/test_aggregates.py index a860badf7..6c8bc5a2f 100644 --- a/nova/tests/api/openstack/compute/contrib/test_aggregates.py +++ b/nova/tests/api/openstack/compute/contrib/test_aggregates.py @@ -209,9 +209,9 @@ class AggregateTestCase(test.TestCase): self.stubs.Set(self.controller.api, "add_host_to_aggregate", stub_add_host_to_aggregate) - aggregate = self.\ - controller.action(self.req, "1", - body={"add_host": {"host": "host1"}}) + aggregate = self.controller.action(self.req, "1", + body={"add_host": {"host": + "host1"}}) self.assertEqual(aggregate["aggregate"], AGGREGATE) diff --git a/nova/tests/api/openstack/compute/contrib/test_createserverext.py b/nova/tests/api/openstack/compute/contrib/test_createserverext.py index 02c2f55b2..1e2266f87 100644 --- a/nova/tests/api/openstack/compute/contrib/test_createserverext.py +++ b/nova/tests/api/openstack/compute/contrib/test_createserverext.py @@ -229,69 +229,69 @@ class CreateserverextTest(test.TestCase): def _create_instance_with_networks_json(self, networks): body_dict = self._create_networks_request_dict(networks) request = self._get_create_request_json(body_dict) - compute_api, response = \ - self._run_create_instance_with_mock_compute_api(request) + _create_inst = self._run_create_instance_with_mock_compute_api + compute_api, response = _create_inst(request) return request, response, compute_api.networks def _create_instance_with_user_data_json(self, networks): body_dict = self._create_user_data_request_dict(networks) request = self._get_create_request_json(body_dict) - compute_api, response = \ - self._run_create_instance_with_mock_compute_api(request) + _create_inst = self._run_create_instance_with_mock_compute_api + compute_api, response = _create_inst(request) return request, response, compute_api.user_data def _create_instance_with_networks_xml(self, networks): body_dict = self._create_networks_request_dict(networks) request = self._get_create_request_xml(body_dict) - compute_api, response = \ - self._run_create_instance_with_mock_compute_api(request) + _create_inst = self._run_create_instance_with_mock_compute_api + compute_api, response = _create_inst(request) return request, response, compute_api.networks def test_create_instance_with_no_networks(self): - request, response, networks = \ - self._create_instance_with_networks_json(networks=None) + _create_inst = self._create_instance_with_networks_json + request, response, networks = _create_inst(networks=None) self.assertEquals(response.status_int, 202) self.assertEquals(networks, None) def test_create_instance_with_no_networks_xml(self): - request, response, networks = \ - self._create_instance_with_networks_xml(networks=None) + _create_inst = self._create_instance_with_networks_xml + request, response, networks = _create_inst(networks=None) self.assertEquals(response.status_int, 202) self.assertEquals(networks, None) def test_create_instance_with_one_network(self): - request, response, networks = \ - self._create_instance_with_networks_json([FAKE_NETWORKS[0]]) + _create_inst = self._create_instance_with_networks_json + request, response, networks = _create_inst([FAKE_NETWORKS[0]]) self.assertEquals(response.status_int, 202) self.assertEquals(networks, [FAKE_NETWORKS[0]]) def test_create_instance_with_one_network_xml(self): - request, response, networks = \ - self._create_instance_with_networks_xml([FAKE_NETWORKS[0]]) + _create_inst = self._create_instance_with_networks_xml + request, response, networks = _create_inst([FAKE_NETWORKS[0]]) self.assertEquals(response.status_int, 202) self.assertEquals(networks, [FAKE_NETWORKS[0]]) def test_create_instance_with_two_networks(self): - request, response, networks = \ - self._create_instance_with_networks_json(FAKE_NETWORKS) + _create_inst = self._create_instance_with_networks_json + request, response, networks = _create_inst(FAKE_NETWORKS) self.assertEquals(response.status_int, 202) self.assertEquals(networks, FAKE_NETWORKS) def test_create_instance_with_two_networks_xml(self): - request, response, networks = \ - self._create_instance_with_networks_xml(FAKE_NETWORKS) + _create_inst = self._create_instance_with_networks_xml + request, response, networks = _create_inst(FAKE_NETWORKS) self.assertEquals(response.status_int, 202) self.assertEquals(networks, FAKE_NETWORKS) def test_create_instance_with_duplicate_networks(self): - request, response, networks = \ - self._create_instance_with_networks_json(DUPLICATE_NETWORKS) + _create_inst = self._create_instance_with_networks_json + request, response, networks = _create_inst(DUPLICATE_NETWORKS) self.assertEquals(response.status_int, 400) self.assertEquals(networks, None) def test_create_instance_with_duplicate_networks_xml(self): - request, response, networks = \ - self._create_instance_with_networks_xml(DUPLICATE_NETWORKS) + _create_inst = self._create_instance_with_networks_xml + request, response, networks = _create_inst(DUPLICATE_NETWORKS) self.assertEquals(response.status_int, 400) self.assertEquals(networks, None) @@ -299,8 +299,8 @@ class CreateserverextTest(test.TestCase): body_dict = self._create_networks_request_dict([FAKE_NETWORKS[0]]) del body_dict['server']['networks'][0]['uuid'] request = self._get_create_request_json(body_dict) - compute_api, response = \ - self._run_create_instance_with_mock_compute_api(request) + _run_create_inst = self._run_create_instance_with_mock_compute_api + compute_api, response = _run_create_inst(request) self.assertEquals(response.status_int, 400) self.assertEquals(compute_api.networks, None) @@ -309,41 +309,41 @@ class CreateserverextTest(test.TestCase): request = self._get_create_request_xml(body_dict) uuid = ' uuid="aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa"' request.body = request.body.replace(uuid, '') - compute_api, response = \ - self._run_create_instance_with_mock_compute_api(request) + _run_create_inst = self._run_create_instance_with_mock_compute_api + compute_api, response = _run_create_inst(request) self.assertEquals(response.status_int, 400) self.assertEquals(compute_api.networks, None) def test_create_instance_with_network_invalid_id(self): - request, response, networks = \ - self._create_instance_with_networks_json(INVALID_NETWORKS) + _create_inst = self._create_instance_with_networks_json + request, response, networks = _create_inst(INVALID_NETWORKS) self.assertEquals(response.status_int, 400) self.assertEquals(networks, None) def test_create_instance_with_network_invalid_id_xml(self): - request, response, networks = \ - self._create_instance_with_networks_xml(INVALID_NETWORKS) + _create_inst = self._create_instance_with_networks_xml + request, response, networks = _create_inst(INVALID_NETWORKS) self.assertEquals(response.status_int, 400) self.assertEquals(networks, None) def test_create_instance_with_network_empty_fixed_ip(self): networks = [('1', '')] - request, response, networks = \ - self._create_instance_with_networks_json(networks) + _create_inst = self._create_instance_with_networks_json + request, response, networks = _create_inst(networks) self.assertEquals(response.status_int, 400) self.assertEquals(networks, None) def test_create_instance_with_network_non_string_fixed_ip(self): networks = [('1', 12345)] - request, response, networks = \ - self._create_instance_with_networks_json(networks) + _create_inst = self._create_instance_with_networks_json + request, response, networks = _create_inst(networks) self.assertEquals(response.status_int, 400) self.assertEquals(networks, None) def test_create_instance_with_network_empty_fixed_ip_xml(self): networks = [('1', '')] - request, response, networks = \ - self._create_instance_with_networks_xml(networks) + _create_inst = self._create_instance_with_networks_xml + request, response, networks = _create_inst(networks) self.assertEquals(response.status_int, 400) self.assertEquals(networks, None) @@ -351,8 +351,8 @@ class CreateserverextTest(test.TestCase): body_dict = self._create_networks_request_dict([FAKE_NETWORKS[0]]) del body_dict['server']['networks'][0]['fixed_ip'] request = self._get_create_request_json(body_dict) - compute_api, response = \ - self._run_create_instance_with_mock_compute_api(request) + _run_create_inst = self._run_create_instance_with_mock_compute_api + compute_api, response = _run_create_inst(request) self.assertEquals(response.status_int, 202) self.assertEquals(compute_api.networks, [('aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa', None)]) @@ -361,8 +361,8 @@ class CreateserverextTest(test.TestCase): body_dict = self._create_networks_request_dict([FAKE_NETWORKS[0]]) request = self._get_create_request_xml(body_dict) request.body = request.body.replace(' fixed_ip="10.0.1.12"', '') - compute_api, response = \ - self._run_create_instance_with_mock_compute_api(request) + _run_create_inst = self._run_create_instance_with_mock_compute_api + compute_api, response = _run_create_inst(request) self.assertEquals(response.status_int, 202) self.assertEquals(compute_api.networks, [('aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa', None)]) @@ -370,22 +370,22 @@ class CreateserverextTest(test.TestCase): def test_create_instance_with_userdata(self): user_data_contents = '#!/bin/bash\necho "Oh no!"\n' user_data_contents = base64.b64encode(user_data_contents) - request, response, user_data = \ - self._create_instance_with_user_data_json(user_data_contents) + _create_inst = self._create_instance_with_user_data_json + request, response, user_data = _create_inst(user_data_contents) self.assertEquals(response.status_int, 202) self.assertEquals(user_data, user_data_contents) def test_create_instance_with_userdata_none(self): user_data_contents = None - request, response, user_data = \ - self._create_instance_with_user_data_json(user_data_contents) + _create_inst = self._create_instance_with_user_data_json + request, response, user_data = _create_inst(user_data_contents) self.assertEquals(response.status_int, 202) self.assertEquals(user_data, user_data_contents) def test_create_instance_with_userdata_with_non_b64_content(self): user_data_contents = '#!/bin/bash\necho "Oh no!"\n' - request, response, user_data = \ - self._create_instance_with_user_data_json(user_data_contents) + _create_inst = self._create_instance_with_user_data_json + request, response, user_data = _create_inst(user_data_contents) self.assertEquals(response.status_int, 400) self.assertEquals(user_data, None) @@ -398,8 +398,8 @@ class CreateserverextTest(test.TestCase): self._setup_mock_network_api() body_dict = self._create_security_group_request_dict(security_groups) request = self._get_create_request_json(body_dict) - compute_api, response = \ - self._run_create_instance_with_mock_compute_api(request) + _run_create_inst = self._run_create_instance_with_mock_compute_api + compute_api, response = _run_create_inst(request) self.assertEquals(response.status_int, 202) def test_get_server_by_id_verify_security_groups_json(self): diff --git a/nova/tests/api/openstack/compute/contrib/test_vsa.py b/nova/tests/api/openstack/compute/contrib/test_vsa.py index 981eb147e..4cb4e820a 100644 --- a/nova/tests/api/openstack/compute/contrib/test_vsa.py +++ b/nova/tests/api/openstack/compute/contrib/test_vsa.py @@ -19,8 +19,8 @@ import json from lxml import etree import webob -from nova.api.openstack.compute.contrib\ - import virtual_storage_arrays as vsa_ext +from nova.api.openstack.compute.contrib import (virtual_storage_arrays as + vsa_ext) from nova import context import nova.db from nova import exception @@ -305,29 +305,29 @@ class VSAVolumeApiTest(test.TestCase): self.assertEqual(resp.status_int, 200) def test_vsa_volume_detail(self): - req = webob.Request.blank('/v2/fake/zadr-vsa/123/%s/detail' % \ - self.test_objs) + req = webob.Request.blank('/v2/fake/zadr-vsa/123/%s/detail' % + self.test_objs) resp = req.get_response(fakes.wsgi_app()) self.assertEqual(resp.status_int, 200) def test_vsa_volume_show(self): obj_num = 234 if self.test_objs == "volumes" else 345 - req = webob.Request.blank('/v2/fake/zadr-vsa/123/%s/%s' % \ - (self.test_objs, obj_num)) + req = webob.Request.blank('/v2/fake/zadr-vsa/123/%s/%s' % + (self.test_objs, obj_num)) resp = req.get_response(fakes.wsgi_app()) self.assertEqual(resp.status_int, 200) def test_vsa_volume_show_no_vsa_assignment(self): - req = webob.Request.blank('/v2/fake/zadr-vsa/4/%s/333' % \ - (self.test_objs)) + req = webob.Request.blank('/v2/fake/zadr-vsa/4/%s/333' % + self.test_objs) resp = req.get_response(fakes.wsgi_app()) self.assertEqual(resp.status_int, 400) def test_vsa_volume_show_no_volume(self): self.stubs.Set(volume.api.API, "get", fakes.stub_volume_get_notfound) - req = webob.Request.blank('/v2/fake/zadr-vsa/123/%s/333' % \ - (self.test_objs)) + req = webob.Request.blank('/v2/fake/zadr-vsa/123/%s/333' % + self.test_objs) resp = req.get_response(fakes.wsgi_app()) self.assertEqual(resp.status_int, 404) @@ -336,8 +336,8 @@ class VSAVolumeApiTest(test.TestCase): update = {"status": "available", "displayName": "Test Display name"} body = {self.test_obj: update} - req = webob.Request.blank('/v2/fake/zadr-vsa/123/%s/%s' % \ - (self.test_objs, obj_num)) + req = webob.Request.blank('/v2/fake/zadr-vsa/123/%s/%s' % + (self.test_objs, obj_num)) req.method = 'PUT' req.body = json.dumps(body) req.headers['content-type'] = 'application/json' @@ -350,8 +350,8 @@ class VSAVolumeApiTest(test.TestCase): def test_vsa_volume_delete(self): obj_num = 234 if self.test_objs == "volumes" else 345 - req = webob.Request.blank('/v2/fake/zadr-vsa/123/%s/%s' % \ - (self.test_objs, obj_num)) + req = webob.Request.blank('/v2/fake/zadr-vsa/123/%s/%s' % + (self.test_objs, obj_num)) req.method = 'DELETE' resp = req.get_response(fakes.wsgi_app()) if self.test_obj == "volume": @@ -360,8 +360,8 @@ class VSAVolumeApiTest(test.TestCase): self.assertEqual(resp.status_int, 400) def test_vsa_volume_delete_no_vsa_assignment(self): - req = webob.Request.blank('/v2/fake/zadr-vsa/4/%s/333' % \ - (self.test_objs)) + req = webob.Request.blank('/v2/fake/zadr-vsa/4/%s/333' % + self.test_objs) req.method = 'DELETE' resp = req.get_response(fakes.wsgi_app()) self.assertEqual(resp.status_int, 400) @@ -369,8 +369,8 @@ class VSAVolumeApiTest(test.TestCase): def test_vsa_volume_delete_no_volume(self): self.stubs.Set(volume.api.API, "get", fakes.stub_volume_get_notfound) - req = webob.Request.blank('/v2/fake/zadr-vsa/123/%s/333' % \ - (self.test_objs)) + req = webob.Request.blank('/v2/fake/zadr-vsa/123/%s/333' % + self.test_objs) req.method = 'DELETE' resp = req.get_response(fakes.wsgi_app()) if self.test_obj == "volume": diff --git a/nova/tests/api/openstack/compute/test_flavors.py b/nova/tests/api/openstack/compute/test_flavors.py index 465a57497..5f264d92f 100644 --- a/nova/tests/api/openstack/compute/test_flavors.py +++ b/nova/tests/api/openstack/compute/test_flavors.py @@ -59,8 +59,8 @@ def fake_instance_type_get_by_flavor_id(flavorid): def fake_instance_type_get_all(inactive=False, filters=None): def reject_min(db_attr, filter_attr): - return filter_attr in filters and\ - int(flavor[db_attr]) < int(filters[filter_attr]) + return (filter_attr in filters and + int(flavor[db_attr]) < int(filters[filter_attr])) filters = filters or {} output = {} diff --git a/nova/tests/api/openstack/compute/test_limits.py b/nova/tests/api/openstack/compute/test_limits.py index e6b5b58ae..26e0094c0 100644 --- a/nova/tests/api/openstack/compute/test_limits.py +++ b/nova/tests/api/openstack/compute/test_limits.py @@ -776,8 +776,8 @@ class WsgiLimiterProxyTest(BaseLimitTestSuite): delay, error = self.proxy.check_for_delay("GET", "/delayed") error = error.strip() - expected = ("60.00", "403 Forbidden\n\nOnly 1 GET request(s) can be "\ - "made to /delayed every minute.") + expected = ("60.00", "403 Forbidden\n\nOnly 1 GET request(s) can be " + "made to /delayed every minute.") self.assertEqual((delay, error), expected) diff --git a/nova/tests/api/openstack/compute/test_servers.py b/nova/tests/api/openstack/compute/test_servers.py index 281ba88e6..9b523ddf7 100644 --- a/nova/tests/api/openstack/compute/test_servers.py +++ b/nova/tests/api/openstack/compute/test_servers.py @@ -1423,8 +1423,8 @@ class ServersControllerCreateTest(test.TestCase): def rpc_call_wrapper(context, topic, msg): """Stub out the scheduler creating the instance entry""" - if topic == FLAGS.scheduler_topic and \ - msg['method'] == 'run_instance': + if (topic == FLAGS.scheduler_topic and + msg['method'] == 'run_instance'): request_spec = msg['args']['request_spec'] num_instances = request_spec.get('num_instances', 1) instances = [] @@ -2399,8 +2399,8 @@ class TestServerCreateRequestXMLDeserializer(test.TestCase): self.assertDictMatch(request['body'], expected) def test_spec_request(self): - image_bookmark_link = "http://servers.api.openstack.org/1234/" + \ - "images/52415800-8b69-11e0-9b19-734f6f006e54" + image_bookmark_link = ("http://servers.api.openstack.org/1234/" + "images/52415800-8b69-11e0-9b19-734f6f006e54") serial_request = """ " " mtu 1500 qdisc pfifo_fast state UNKNOWN qlen 1000\n" " link/ether de:ad:be:ef:be:ef brd ff:ff:ff:ff:ff:ff\n" diff --git a/nova/tests/test_log.py b/nova/tests/test_log.py index 122351ff6..308395940 100644 --- a/nova/tests/test_log.py +++ b/nova/tests/test_log.py @@ -80,8 +80,9 @@ class LogHandlerTestCase(test.TestCase): class NovaFormatterTestCase(test.TestCase): def setUp(self): super(NovaFormatterTestCase, self).setUp() - self.flags(logging_context_format_string="HAS CONTEXT "\ - "[%(request_id)s]: %(message)s", + self.flags(logging_context_format_string="HAS CONTEXT " + "[%(request_id)s]: " + "%(message)s", logging_default_format_string="NOCTXT: %(message)s", logging_debug_format_suffix="--DBG") self.log = log.logging.root diff --git a/nova/tests/test_network.py b/nova/tests/test_network.py index 695d90bad..832aaca91 100644 --- a/nova/tests/test_network.py +++ b/nova/tests/test_network.py @@ -1171,9 +1171,9 @@ class CommonNetworkTestCase(test.TestCase): manager = fake_network.FakeNetworkManager() fake_context = context.RequestContext('user', 'project') self.mox.StubOutWithMock(manager.db, 'network_get_all_by_uuids') - manager.db.network_get_all_by_uuids(mox.IgnoreArg(), - mox.IgnoreArg()).\ - AndReturn(networks) + manager.db.network_get_all_by_uuids( + mox.IgnoreArg(), + mox.IgnoreArg()).AndReturn(networks) self.mox.ReplayAll() uuid = 'aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa' network = manager.get_network(fake_context, uuid) @@ -1184,8 +1184,7 @@ class CommonNetworkTestCase(test.TestCase): fake_context = context.RequestContext('user', 'project') self.mox.StubOutWithMock(manager.db, 'network_get_all_by_uuids') manager.db.network_get_all_by_uuids(mox.IgnoreArg(), - mox.IgnoreArg()).\ - AndReturn([]) + mox.IgnoreArg()).AndReturn([]) self.mox.ReplayAll() uuid = 'eeeeeeee-eeee-eeee-eeee-eeeeeeeeeeee' self.assertRaises(exception.NetworkNotFound, @@ -1195,8 +1194,7 @@ class CommonNetworkTestCase(test.TestCase): manager = fake_network.FakeNetworkManager() fake_context = context.RequestContext('user', 'project') self.mox.StubOutWithMock(manager.db, 'network_get_all') - manager.db.network_get_all(mox.IgnoreArg()).\ - AndReturn(networks) + manager.db.network_get_all(mox.IgnoreArg()).AndReturn(networks) self.mox.ReplayAll() output = manager.get_all_networks(fake_context) self.assertEqual(len(networks), 2) @@ -1209,9 +1207,9 @@ class CommonNetworkTestCase(test.TestCase): manager = fake_network.FakeNetworkManager() fake_context = context.RequestContext('user', 'project') self.mox.StubOutWithMock(manager.db, 'network_get_all_by_uuids') - manager.db.network_get_all_by_uuids(mox.IgnoreArg(), - mox.IgnoreArg()).\ - AndReturn(networks) + manager.db.network_get_all_by_uuids( + mox.IgnoreArg(), + mox.IgnoreArg()).AndReturn(networks) self.mox.ReplayAll() uuid = 'aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa' manager.disassociate_network(fake_context, uuid) @@ -1221,8 +1219,7 @@ class CommonNetworkTestCase(test.TestCase): fake_context = context.RequestContext('user', 'project') self.mox.StubOutWithMock(manager.db, 'network_get_all_by_uuids') manager.db.network_get_all_by_uuids(mox.IgnoreArg(), - mox.IgnoreArg()).\ - AndReturn([]) + mox.IgnoreArg()).AndReturn([]) self.mox.ReplayAll() uuid = 'eeeeeeee-eeee-eeee-eeee-eeeeeeeeeeee' self.assertRaises(exception.NetworkNotFound, diff --git a/nova/tests/test_nova_manage.py b/nova/tests/test_nova_manage.py index 354e9d98c..2190d9c02 100644 --- a/nova/tests/test_nova_manage.py +++ b/nova/tests/test_nova_manage.py @@ -172,9 +172,9 @@ class NetworkCommandsTestCase(test.TestCase): self.commands.list() sys.stdout = sys.__stdout__ result = output.getvalue() - _fmt = "%(id)-5s\t%(cidr)-18s\t%(cidr_v6)-15s\t%(dhcp_start)-15s\t" +\ - "%(dns1)-15s\t%(dns2)-15s\t%(vlan)-15s\t%(project_id)-15s\t" +\ - "%(uuid)-15s" + _fmt = "\t".join(["%(id)-5s", "%(cidr)-18s", "%(cidr_v6)-15s", + "%(dhcp_start)-15s", "%(dns1)-15s", "%(dns2)-15s", + "%(vlan)-15s", "%(project_id)-15s", "%(uuid)-15s"]) head = _fmt % {'id': _('id'), 'cidr': _('IPv4'), 'cidr_v6': _('IPv6'), diff --git a/nova/tests/test_quantum.py b/nova/tests/test_quantum.py index 7a2dc07d2..4042b35dd 100644 --- a/nova/tests/test_quantum.py +++ b/nova/tests/test_quantum.py @@ -465,8 +465,8 @@ class QuantumNovaPortSecurityTestCase(QuantumNovaTestCase): self.assertTrue(pairs[0]['mac_address'] == fake_mac) self.net_man.q_conn.create_and_attach_port = oldfunc return oldfunc(tenant_id, net_id, interface_id, **kwargs) - self.net_man.q_conn.create_and_attach_port = \ - _instrumented_create_and_attach_port + _port_attach = _instrumented_create_and_attach_port + self.net_man.q_conn.create_and_attach_port = _port_attach nw_info = self.net_man.allocate_for_instance(ctx, instance_id=instance_ref['id'], host="", rxtx_factor=3, @@ -500,8 +500,8 @@ class QuantumNovaPortSecurityTestCase(QuantumNovaTestCase): self.assertTrue(len(pairs) == 0) self.net_man.q_conn.create_and_attach_port = oldfunc return oldfunc(tenant_id, net_id, interface_id, **kwargs) - self.net_man.q_conn.create_and_attach_port = \ - _instrumented_create_and_attach_port + _port_attach = _instrumented_create_and_attach_port + self.net_man.q_conn.create_and_attach_port = _port_attach nw_info = self.net_man.allocate_for_instance(ctx, instance_id=instance_ref['id'], host="", rxtx_factor=3, diff --git a/nova/tests/test_quota.py b/nova/tests/test_quota.py index 23660333a..a3ec9727b 100644 --- a/nova/tests/test_quota.py +++ b/nova/tests/test_quota.py @@ -59,8 +59,8 @@ class QuotaTestCase(test.TestCase): def rpc_call_wrapper(context, topic, msg): """Stub out the scheduler creating the instance entry""" - if topic == FLAGS.scheduler_topic and \ - msg['method'] == 'run_instance': + if (topic == FLAGS.scheduler_topic and + msg['method'] == 'run_instance'): scheduler = scheduler_driver.Scheduler instance = scheduler().create_instance_db_entry( context, diff --git a/nova/tests/test_volume_types.py b/nova/tests/test_volume_types.py index b0663d1b6..809ab129b 100644 --- a/nova/tests/test_volume_types.py +++ b/nova/tests/test_volume_types.py @@ -78,8 +78,7 @@ class VolumeTypeTestCase(test.TestCase): def test_get_all_volume_types(self): """Ensures that all volume types can be retrieved""" session = get_session() - total_volume_types = session.query(models.VolumeTypes).\ - count() + total_volume_types = session.query(models.VolumeTypes).count() vol_types = volume_types.get_all_types(self.ctxt) self.assertEqual(total_volume_types, len(vol_types)) diff --git a/nova/tests/test_xenapi.py b/nova/tests/test_xenapi.py index 2b1f99f7b..12792e54d 100644 --- a/nova/tests/test_xenapi.py +++ b/nova/tests/test_xenapi.py @@ -513,8 +513,8 @@ class XenAPIVMTestCase(test.TestCase): # Change the default host_call_plugin to one that'll return # a swap disk orig_func = stubs.FakeSessionForVMTests.host_call_plugin - stubs.FakeSessionForVMTests.host_call_plugin = \ - stubs.FakeSessionForVMTests.host_call_plugin_swap + _host_call_plugin = stubs.FakeSessionForVMTests.host_call_plugin_swap + stubs.FakeSessionForVMTests.host_call_plugin = _host_call_plugin # Stubbing out firewall driver as previous stub sets a particular # stub for async plugin calls stubs.stubout_firewall_driver(self.stubs, self.conn) @@ -954,8 +954,8 @@ class XenAPIMigrateInstance(test.TestCase): self.assertEqual(self.fake_vm_start_called, True) def test_finish_migrate_no_local_storage(self): - tiny_type_id = \ - instance_types.get_instance_type_by_name('m1.tiny')['id'] + tiny_type = instance_types.get_instance_type_by_name('m1.tiny') + tiny_type_id = tiny_type['id'] self.instance_values.update({'instance_type_id': tiny_type_id, 'root_gb': 0}) instance = db.instance_create(self.context, self.instance_values) @@ -1550,10 +1550,10 @@ class XenAPIDom0IptablesFirewallTestCase(test.TestCase): ipv6_addr_per_network = 1 networks_count = 5 instance_ref = self._create_instance_ref() - network_info = fake_network.\ - fake_get_instance_nw_info(self.stubs, - networks_count, - ipv4_addr_per_network) + _get_instance_nw_info = fake_network.fake_get_instance_nw_info + network_info = _get_instance_nw_info(self.stubs, + networks_count, + ipv4_addr_per_network) ipv4_len = len(self.fw.iptables.ipv4['filter'].rules) ipv6_len = len(self.fw.iptables.ipv6['filter'].rules) inst_ipv4, inst_ipv6 = self.fw.instance_rules(instance_ref, @@ -1681,8 +1681,8 @@ class XenAPISRSelectionTestCase(test.TestCase): helper = vm_utils.VMHelper helper.XenAPI = session.get_imported_xenapi() host_ref = xenapi_fake.get_all('host')[0] - local_sr = xenapi_fake.\ - create_sr(name_label='Fake Storage', + local_sr = xenapi_fake.create_sr( + name_label='Fake Storage', type='lvm', other_config={'i18n-original-value-name_label': 'Local storage', @@ -1699,11 +1699,10 @@ class XenAPISRSelectionTestCase(test.TestCase): helper = vm_utils.VMHelper helper.XenAPI = session.get_imported_xenapi() host_ref = xenapi_fake.get_all('host')[0] - local_sr = xenapi_fake.\ - create_sr(name_label='Fake Storage', - type='lvm', - other_config={'my_fake_sr': 'true'}, - host_ref=host_ref) + local_sr = xenapi_fake.create_sr(name_label='Fake Storage', + type='lvm', + other_config={'my_fake_sr': 'true'}, + host_ref=host_ref) expected = helper.safe_find_sr(session) self.assertEqual(local_sr, expected) diff --git a/nova/tests/xenapi/stubs.py b/nova/tests/xenapi/stubs.py index 27e2acd9e..df444d515 100644 --- a/nova/tests/xenapi/stubs.py +++ b/nova/tests/xenapi/stubs.py @@ -160,14 +160,14 @@ def _make_fake_vdi(): class FakeSessionForVMTests(fake.SessionBase): """ Stubs out a XenAPISession for VM tests """ - _fake_iptables_save_output = \ - "# Generated by iptables-save v1.4.10 on Sun Nov 6 22:49:02 2011\n"\ - "*filter\n"\ - ":INPUT ACCEPT [0:0]\n"\ - ":FORWARD ACCEPT [0:0]\n"\ - ":OUTPUT ACCEPT [0:0]\n"\ - "COMMIT\n"\ - "# Completed on Sun Nov 6 22:49:02 2011\n" + _fake_iptables_save_output = ("# Generated by iptables-save v1.4.10 on " + "Sun Nov 6 22:49:02 2011\n" + "*filter\n" + ":INPUT ACCEPT [0:0]\n" + ":FORWARD ACCEPT [0:0]\n" + ":OUTPUT ACCEPT [0:0]\n" + "COMMIT\n" + "# Completed on Sun Nov 6 22:49:02 2011\n") def __init__(self, uri): super(FakeSessionForVMTests, self).__init__(uri) -- cgit