Enable W292

W292 no newline at end of file

W292 started failing with hacking 0.10.0, fix all cases and gate on the
rule.

Change-Id: I6196e8059e71730cc567d4dd211264cdd2272c40

nova/api/openstack/compute/contrib/extended_availability_zone.py

@@ -64,4 +64,4 @@ class Extended_availability_zone(extensions.ExtensionDescriptor):
     def get_controller_extensions(self):
         controller = ExtendedAZController()
         extension = extensions.ControllerExtension(self, 'servers', controller)
-        return [extension]
+        return [extension]

nova/api/openstack/compute/contrib/extended_ips.py

@@ -75,4 +75,4 @@ class Extended_ips(extensions.ExtensionDescriptor):
     def get_controller_extensions(self):
         controller = ExtendedIpsController()
         extension = extensions.ControllerExtension(self, 'servers', controller)
-        return [extension]
+        return [extension]

nova/api/openstack/compute/contrib/extended_ips_mac.py

@@ -73,4 +73,4 @@ class Extended_ips_mac(extensions.ExtensionDescriptor):
     def get_controller_extensions(self):
         controller = ExtendedIpsMacController()
         extension = extensions.ControllerExtension(self, 'servers', controller)
-        return [extension]
+        return [extension]

nova/api/openstack/compute/contrib/extended_server_attributes.py

@@ -68,4 +68,4 @@ class Extended_server_attributes(extensions.ExtensionDescriptor):
     def get_controller_extensions(self):
         controller = ExtendedServerAttributesController()
         extension = extensions.ControllerExtension(self, 'servers', controller)
-        return [extension]
+        return [extension]

nova/api/openstack/compute/contrib/extended_status.py

@@ -63,4 +63,4 @@ class Extended_status(extensions.ExtensionDescriptor):
     def get_controller_extensions(self):
         controller = ExtendedStatusController()
         extension = extensions.ControllerExtension(self, 'servers', controller)
-        return [extension]
+        return [extension]

nova/api/openstack/compute/contrib/extended_volumes.py

@@ -71,4 +71,4 @@ class Extended_volumes(extensions.ExtensionDescriptor):
         return [extension]
 
     def get_resources(self):
-        return []
+        return []

nova/api/openstack/compute/contrib/flavor_disabled.py

@@ -61,4 +61,4 @@ class Flavor_disabled(extensions.ExtensionDescriptor):
     def get_controller_extensions(self):
         controller = FlavorDisabledController()
         extension = extensions.ControllerExtension(self, 'flavors', controller)
-        return [extension]
+        return [extension]

nova/api/openstack/compute/contrib/flavor_rxtx.py

@@ -61,4 +61,4 @@ class Flavor_rxtx(extensions.ExtensionDescriptor):
     def get_controller_extensions(self):
         controller = FlavorRxtxController()
         extension = extensions.ControllerExtension(self, 'flavors', controller)
-        return [extension]
+        return [extension]

nova/api/openstack/compute/contrib/flavor_swap.py

@@ -61,4 +61,4 @@ class Flavor_swap(extensions.ExtensionDescriptor):
     def get_controller_extensions(self):
         controller = FlavorSwapController()
         extension = extensions.ControllerExtension(self, 'flavors', controller)
-        return [extension]
+        return [extension]

nova/api/openstack/compute/contrib/flavorextradata.py

@@ -69,4 +69,4 @@ class Flavorextradata(extensions.ExtensionDescriptor):
     def get_controller_extensions(self):
         controller = FlavorextradataController()
         extension = extensions.ControllerExtension(self, 'flavors', controller)
-        return [extension]
+        return [extension]

nova/api/openstack/compute/contrib/server_usage.py

@@ -70,4 +70,4 @@ class Server_usage(extensions.ExtensionDescriptor):
     def get_controller_extensions(self):
         controller = ServerUsageController()
         extension = extensions.ControllerExtension(self, 'servers', controller)
-        return [extension]
+        return [extension]

nova/tests/unit/api/openstack/compute/contrib/test_block_device_mapping_v1.py

@@ -390,4 +390,4 @@ class BlockDeviceMappingTestV2(BlockDeviceMappingTestV21):
         self._test_create({}, override_controller=controller)
 
         params = {'block_device_mapping': bdm}
-        self._test_create(params, override_controller=controller)
+        self._test_create(params, override_controller=controller)

nova/tests/unit/api/openstack/compute/contrib/test_certificates.py

@@ -120,4 +120,4 @@ class CertificatesTestV2(CertificatesTestV21):
     certificates = certificates_v2
     url = '/v2/fake/os-certificates'
     certificate_show_extension = 'compute_extension:certificates'
-    certificate_create_extension = 'compute_extension:certificates'
+    certificate_create_extension = 'compute_extension:certificates'

nova/tests/unit/api/openstack/compute/contrib/test_cloudpipe.py

@@ -160,4 +160,4 @@ class CloudpipeTestV2(CloudpipeTestV21):
     cloudpipe = cloudpipe_v2
 
     def test_cloudpipe_create_with_bad_project_id_failed(self):
-        pass
+        pass

nova/tests/unit/api/openstack/compute/contrib/test_createserverext.py

@@ -265,4 +265,4 @@ class CreateserverextTest(test.TestCase):
         res_dict = jsonutils.loads(response.body)
         expected_security_group = [{"name": "test"}]
         self.assertEqual(res_dict['server'].get('security_groups'),
-                         expected_security_group)
+                         expected_security_group)

nova/tests/unit/api/openstack/compute/contrib/test_extended_availability_zone.py

@@ -167,4 +167,4 @@ class ExtendedAvailabilityZoneTestV2(ExtendedAvailabilityZoneTestV21):
         req = webob.Request.blank(url)
         req.headers['Accept'] = self.content_type
         res = req.get_response(fakes.wsgi_app(init_only=('servers',)))
-        return res
+        return res

nova/tests/unit/api/openstack/compute/contrib/test_extended_ips.py

@@ -167,4 +167,4 @@ class ExtendedIpsTestV2(ExtendedIpsTestV21):
         req = webob.Request.blank(url)
         req.headers['Accept'] = self.content_type
         res = req.get_response(fakes.wsgi_app(init_only=('servers',)))
-        return res
+        return res

nova/tests/unit/api/openstack/compute/contrib/test_extended_ips_mac.py

@@ -175,4 +175,4 @@ class ExtendedIpsMacTestV2(ExtendedIpsMacTestV21):
         req = webob.Request.blank(url)
         req.headers['Accept'] = self.content_type
         res = req.get_response(fakes.wsgi_app(init_only=('servers',)))
-        return res
+        return res

nova/tests/unit/api/openstack/compute/contrib/test_extended_server_attributes.py

@@ -130,4 +130,4 @@ class ExtendedServerAttributesTestV2(ExtendedServerAttributesTestV21):
         req = webob.Request.blank(url)
         req.headers['Accept'] = self.content_type
         res = req.get_response(fakes.wsgi_app(init_only=('servers',)))
-        return res
+        return res

nova/tests/unit/api/openstack/compute/contrib/test_extended_status.py

@@ -132,4 +132,4 @@ class ExtendedStatusTestV2(ExtendedStatusTestV21):
         req = webob.Request.blank(url)
         req.headers['Accept'] = self.content_type
         res = req.get_response(fakes.wsgi_app(init_only=('servers',)))
-        return res
+        return res

nova/tests/unit/api/openstack/compute/contrib/test_extended_virtual_interfaces_net.py

@@ -99,4 +99,4 @@ class ExtendedServerVIFNetTest(test.NoDBTestCase):
         res = self._make_request('/v2/fake/servers/abcd/os-virtual-interfaces')
 
         self.assertEqual(res.status_int, 200)
-        self.assertVIFs(self._get_vifs(res.body))
+        self.assertVIFs(self._get_vifs(res.body))

nova/tests/unit/api/openstack/compute/contrib/test_extended_volumes.py

@@ -100,4 +100,4 @@ class ExtendedVolumesTest(test.TestCase):
         exp_volumes = [{'id': UUID1}, {'id': UUID2}]
         for i, server in enumerate(self._get_servers(res.body)):
             actual = server.get('%svolumes_attached' % self.prefix)
-            self.assertEqual(exp_volumes, actual)
+            self.assertEqual(exp_volumes, actual)

nova/tests/unit/api/openstack/compute/contrib/test_flavor_disabled.py

@@ -111,4 +111,4 @@ class FlavorDisabledTestV2(FlavorDisabledTestV21):
         req = webob.Request.blank(url)
         req.headers['Accept'] = self.content_type
         res = req.get_response(fakes.wsgi_app())
-        return res
+        return res

nova/tests/unit/api/openstack/compute/contrib/test_flavor_rxtx.py

@@ -113,4 +113,4 @@ class FlavorRxtxTestV21(test.NoDBTestCase):
 class FlavorRxtxTestV20(FlavorRxtxTestV21):
 
     def _get_app(self):
-        return fakes.wsgi_app()
+        return fakes.wsgi_app()

nova/tests/unit/api/openstack/compute/contrib/test_flavor_swap.py

@@ -112,4 +112,4 @@ class FlavorSwapTestV2(FlavorSwapTestV21):
         req = webob.Request.blank(url)
         req.headers['Accept'] = self.content_type
         res = req.get_response(fakes.wsgi_app())
-        return res
+        return res

nova/tests/unit/api/openstack/compute/contrib/test_flavors_extra_specs.py

@@ -374,4 +374,4 @@ class FlavorsExtraSpecsTestV21(test.TestCase):
 
 class FlavorsExtraSpecsTestV2(FlavorsExtraSpecsTestV21):
     bad_request = webob.exc.HTTPBadRequest
-    flavorextraspecs = flavorextraspecs_v2
+    flavorextraspecs = flavorextraspecs_v2

nova/tests/unit/api/openstack/compute/contrib/test_floating_ip_dns.py

@@ -396,4 +396,4 @@ class FloatingIpDNSTestV2(FloatingIpDNSTestV21):
         self.assertEqual(expected_status, res.status_int)
 
     def _bad_request(self):
-        return webob.exc.HTTPUnprocessableEntity
+        return webob.exc.HTTPUnprocessableEntity

nova/tests/unit/api/openstack/compute/contrib/test_floating_ip_pools.py

@@ -57,4 +57,4 @@ class FloatingIpPoolTestV21(test.NoDBTestCase):
 
 
 class FloatingIpPoolTestV2(FloatingIpPoolTestV21):
-    floating_ip_pools = fipp_v2
+    floating_ip_pools = fipp_v2

nova/tests/unit/api/openstack/compute/contrib/test_hide_server_addresses.py

@@ -148,4 +148,4 @@ class HideServerAddressesTestV2(HideServerAddressesTestV21):
             osapi_compute_extension=[
                 'nova.api.openstack.compute.contrib.select_extensions'],
             osapi_compute_ext_list=['Hide_server_addresses'])
-        self.wsgi_app = fakes.wsgi_app(init_only=('servers',))
+        self.wsgi_app = fakes.wsgi_app(init_only=('servers',))

nova/tests/unit/api/openstack/compute/contrib/test_image_size.py

@@ -119,4 +119,4 @@ class ImageSizeTestV21(test.NoDBTestCase):
 
 class ImageSizeTestV2(ImageSizeTestV21):
     def _get_app(self):
-        return fakes.wsgi_app()
+        return fakes.wsgi_app()

nova/tests/unit/api/openstack/compute/contrib/test_instance_actions.py

@@ -253,4 +253,4 @@ class InstanceActionsTestV2(InstanceActionsTestV21):
                      common_policy.parse_rule(''),
                  'compute_extension:instance_actions:events':
                      common_policy.parse_rule('is_admin:True')}
-        policy.set_rules(rules)
+        policy.set_rules(rules)

nova/tests/unit/api/openstack/compute/contrib/test_migrations.py

@@ -119,4 +119,4 @@ class MigrationsTestCaseV21(test.NoDBTestCase):
 
 
 class MigrationsTestCaseV2(MigrationsTestCaseV21):
-    migrations = migrations_v2
+    migrations = migrations_v2

nova/tests/unit/api/openstack/compute/contrib/test_quota_classes.py

@@ -165,4 +165,4 @@ class QuotaClassSetsTestV2(QuotaClassSetsTestV21):
     def _setup(self):
         ext_mgr = extensions.ExtensionManager()
         ext_mgr.extensions = {}
-        self.controller = quota_classes.QuotaClassSetsController(ext_mgr)
+        self.controller = quota_classes.QuotaClassSetsController(ext_mgr)

nova/tests/unit/api/openstack/compute/contrib/test_security_groups.py

@@ -1455,4 +1455,4 @@ class SecurityGroupsOutputTestV21(test.TestCase):
 class SecurityGroupsOutputTestV2(SecurityGroupsOutputTestV21):
 
     def _setup_app(self):
-        return fakes.wsgi_app(init_only=('servers',))
+        return fakes.wsgi_app(init_only=('servers',))

nova/tests/unit/api/openstack/compute/contrib/test_server_diagnostics.py

@@ -97,4 +97,4 @@ class ServerDiagnosticsTestV2(ServerDiagnosticsTestV21):
                 'nova.api.openstack.compute.contrib.select_extensions'],
             osapi_compute_ext_list=['Server_diagnostics'])
 
-        self.router = compute.APIRouter(init_only=('servers', 'diagnostics'))
+        self.router = compute.APIRouter(init_only=('servers', 'diagnostics'))

nova/tests/unit/api/openstack/compute/contrib/test_server_groups.py

@@ -342,4 +342,4 @@ class ServerGroupTestV2(ServerGroupTestV21):
     def _setup_controller(self):
         ext_mgr = extensions.ExtensionManager()
         ext_mgr.extensions = {}
-        self.controller = server_groups.ServerGroupController(ext_mgr)
+        self.controller = server_groups.ServerGroupController(ext_mgr)

nova/tests/unit/api/openstack/compute/contrib/test_server_usage.py

@@ -143,4 +143,4 @@ class ServerUsageTestV20(ServerUsageTestV21):
             osapi_compute_ext_list=['Server_usage'])
 
     def _get_app(self):
-        return fakes.wsgi_app(init_only=('servers',))
+        return fakes.wsgi_app(init_only=('servers',))

nova/tests/unit/api/openstack/compute/contrib/test_snapshots.py

@@ -148,4 +148,4 @@ class SnapshotApiTest(test.NoDBTestCase):
         self.assertEqual(len(resp_snapshots), 3)
 
         resp_snapshot = resp_snapshots.pop()
-        self.assertEqual(resp_snapshot['id'], 102)
+        self.assertEqual(resp_snapshot['id'], 102)

nova/tests/unit/api/openstack/compute/contrib/test_used_limits.py

@@ -269,4 +269,4 @@ class UsedLimitsTestCaseV2(UsedLimitsTestCaseV21):
 
 class UsedLimitsTestCaseV2WithoutServerGroupQuotas(UsedLimitsTestCaseV2):
     used_limit_extension = "compute_extension:used_limits_for_admin"
-    include_server_group_quotas = False
+    include_server_group_quotas = False

nova/tests/unit/api/openstack/compute/contrib/test_virtual_interfaces.py

@@ -89,4 +89,4 @@ class ServerVirtualInterfaceTestV21(test.NoDBTestCase):
 class ServerVirtualInterfaceTestV20(ServerVirtualInterfaceTestV21):
 
     def _set_controller(self):
-        self.controller = vi20.ServerVirtualInterfaceController()
+        self.controller = vi20.ServerVirtualInterfaceController()

nova/tests/unit/api/openstack/compute/test_consoles.py

@@ -266,4 +266,4 @@ class ConsolesControllerTestV21(test.NoDBTestCase):
 
 class ConsolesControllerTestV2(ConsolesControllerTestV21):
     def _set_up_controller(self):
-        self.controller = consoles_v2.Controller()
+        self.controller = consoles_v2.Controller()

nova/tests/unit/api/openstack/compute/test_images.py

@@ -389,4 +389,4 @@ class ImagesControllerTestV2(ImagesControllerTestV21):
     http_request = fakes.HTTPRequest
 
     def _check_response(self, controller_method, response, expected_code):
-        self.assertEqual(expected_code, response.status_int)
+        self.assertEqual(expected_code, response.status_int)

nova/tests/unit/api/openstack/compute/test_server_actions.py

@@ -1326,4 +1326,4 @@ class ServerActionsControllerTest(test.TestCase):
         req = fakes.HTTPRequest.blank(self.url)
         self.assertRaises(webob.exc.HTTPConflict,
                           self.controller._action_create_image,
-                          req, FAKE_UUID, body)
+                          req, FAKE_UUID, body)

nova/tests/unit/api/openstack/test_faults.py

@@ -149,4 +149,4 @@ class TestFaults(test.NoDBTestCase):
     def test_fault_has_status_int(self):
         # Ensure the status_int is set correctly on faults.
         fault = wsgi.Fault(webob.exc.HTTPBadRequest(explanation='what?'))
-        self.assertEqual(fault.status_int, 400)
+        self.assertEqual(fault.status_int, 400)

nova/tests/unit/virt/test_images.py

@@ -42,4 +42,4 @@ class QemuTestCase(test.NoDBTestCase):
                                       utils_execute):
         image_info = images.qemu_img_info('/fake/path')
         self.assertTrue(image_info)
-        self.assertTrue(str(image_info))
+        self.assertTrue(str(image_info))

tox.ini

@@ -67,9 +67,8 @@ commands = python setup.py build_sphinx
 # New from hacking 0.9: E129, E131, H407, H405
 # E251 Skipped due to https://github.com/jcrocholl/pep8/issues/301
 # New from hacking 0.10: H238
-# Temporarily skip W292 (new in hacking 0.10)
 
-ignore = E121,E122,E123,E124,E125,E126,E127,E128,E129,E131,E251,H405,H238,W292
+ignore = E121,E122,E123,E124,E125,E126,E127,E128,E129,E131,E251,H405,H238
 exclude =  .venv,.git,.tox,dist,doc,*openstack/common*,*lib/python*,*egg,build,tools/xenserver*
 # To get a list of functions that are more complex than 25, set max-complexity
 # to 25 and run 'tox -epep8'.