Backslash continuations (nova.tests)

Fixes bug #925285

Backslash continuations removal for package nova.tests

Change-Id: I089dfb9a06a807e58ebb21329800a4eff40ed2bb

8 files changed, 83 insertions, 83 deletions

diff --git a/nova/tests/api/openstack/compute/contrib/test_aggregates.py b/nova/tests/api/openstack/compute/contrib/test_aggregates.py
index a860badf78..6c8bc5a2f6 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 02c2f55b2a..1e2266f87b 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 981eb147e6..4cb4e820a8 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 465a57497e..5f264d92f4 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 e6b5b58ae2..26e0094c04 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 281ba88e6a..9b523ddf74 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 = """
 <server xmlns="http://docs.openstack.org/compute/api/v2"
         imageRef="%s"
@@ -2417,8 +2417,8 @@ class TestServerCreateRequestXMLDeserializer(test.TestCase):
         expected = {
             "server": {
                 "name": "new-server-test",
-                "imageRef": "http://servers.api.openstack.org/1234/" + \
-                            "images/52415800-8b69-11e0-9b19-734f6f006e54",
+                "imageRef": ("http://servers.api.openstack.org/1234/"
+                             "images/52415800-8b69-11e0-9b19-734f6f006e54"),
                 "flavorRef": "52415800-8b69-11e0-9b19-734f1195ff37",
                 "metadata": {"My Server Name": "Apache1"},
                 "personality": [
diff --git a/nova/tests/api/openstack/fakes.py b/nova/tests/api/openstack/fakes.py
index 7d5d429e40..de42c859a7 100644
--- a/nova/tests/api/openstack/fakes.py
+++ b/nova/tests/api/openstack/fakes.py
@@ -406,8 +406,8 @@ class FakeAuthManager(object):
 
     def create_project(self, name, manager_user, description=None,
                        member_users=None):
-        member_ids = [User.safe_id(m) for m in member_users] \
-                     if member_users else []
+        member_ids = ([User.safe_id(m) for m in member_users]
+                      if member_users else [])
         p = Project(name, name, User.safe_id(manager_user),
                                  description, member_ids)
         FakeAuthManager.projects[name] = p
diff --git a/nova/tests/api/openstack/test_wsgi.py b/nova/tests/api/openstack/test_wsgi.py
index 3974971fab..8f9a7a5a5b 100644
--- a/nova/tests/api/openstack/test_wsgi.py
+++ b/nova/tests/api/openstack/test_wsgi.py
@@ -48,8 +48,8 @@ class RequestTest(test.TestCase):
         self.assertEqual(result, "application/json")
 
         request = wsgi.Request.blank('/tests/123')
-        request.headers["Accept"] = \
-            "application/json; q=0.3, application/xml; q=0.9"
+        request.headers["Accept"] = ("application/json; q=0.3, "
+                                     "application/xml; q=0.9")
         result = request.best_match_content_type()
         self.assertEqual(result, "application/xml")