Fixing pep8 errors in tests/*py

Fixes bug 1022575

Making change to tests/*py to pass pep8 tests.
pep8 tests started failing following
39b20acc933cb0fdf73075ddb9a9d82665b84b23 update pep8 to 1.3.3
04df79b64e5f2296df03579700535774e158f623 include tests dir in pep8 tests

Change-Id: I2d7dec0a87f1ae9b5f828d7f321b65bf8c06a421

1 files changed, 37 insertions, 21 deletions

diff --git a/tests/test_content_types.py b/tests/test_content_types.py
index 0858de89..ba8d2a28 100644
--- a/tests/test_content_types.py
+++ b/tests/test_content_types.py
@@ -71,9 +71,9 @@ class RestfulTestCase(test.TestCase):
         # TODO(termie): add an admin user to the fixtures and use that user
         # override the fixtures, for now
         self.metadata_foobar = self.identity_api.update_metadata(
-                self.user_foo['id'],
-                self.tenant_bar['id'],
-                dict(roles=['keystone_admin'], is_admin='1'))
+            self.user_foo['id'],
+            self.tenant_bar['id'],
+            dict(roles=['keystone_admin'], is_admin='1'))
 
     def tearDown(self):
         """Kill running servers and release references to avoid leaks."""
@@ -123,7 +123,8 @@ class RestfulTestCase(test.TestCase):
 
             >>> self.assertResponseSuccessful(response, 203)
         """
-        self.assertTrue(response.status >= 200 and response.status <= 299,
+        self.assertTrue(
+            response.status >= 200 and response.status <= 299,
             'Status code %d is outside of the expected range (2xx)\n\n%s' %
             (response.status, response.body))
 
@@ -137,7 +138,9 @@ class RestfulTestCase(test.TestCase):
 
             >>> self.assertResponseStatus(response, 203)
         """
-        self.assertEqual(response.status, expected_status,
+        self.assertEqual(
+            response.status,
+            expected_status,
             'Status code %s is not %s, as expected)\n\n%s' %
             (response.status, expected_status, response.body))
 
@@ -225,7 +228,10 @@ class RestfulTestCase(test.TestCase):
 
     def get_scoped_token(self):
         """Convenience method so that we can test authenticated requests."""
-        r = self.public_request(method='POST', path='/v2.0/tokens', body={
+        r = self.public_request(
+            method='POST',
+            path='/v2.0/tokens',
+            body={
                 'auth': {
                     'passwordCredentials': {
                         'username': self.user_foo['name'],
@@ -341,7 +347,10 @@ class CoreApiTests(object):
         self.assertValidExtensionResponse(r)
 
     def test_authenticate(self):
-        r = self.public_request(method='POST', path='/v2.0/tokens', body={
+        r = self.public_request(
+            method='POST',
+            path='/v2.0/tokens',
+            body={
                 'auth': {
                     'passwordCredentials': {
                         'username': self.user_foo['name'],
@@ -356,12 +365,13 @@ class CoreApiTests(object):
 
     def test_get_tenants_for_token(self):
         r = self.public_request(path='/v2.0/tenants',
-            token=self.get_scoped_token())
+                                token=self.get_scoped_token())
         self.assertValidTenantListResponse(r)
 
     def test_validate_token(self):
         token = self.get_scoped_token()
-        r = self.admin_request(path='/v2.0/tokens/%(token_id)s' % {
+        r = self.admin_request(
+            path='/v2.0/tokens/%(token_id)s' % {
                 'token_id': token,
             },
             token=token)
@@ -390,7 +400,9 @@ class CoreApiTests(object):
 
         """
         token = self.get_scoped_token()
-        self.admin_request(method='HEAD', path='/v2.0/tokens/%(token_id)s' % {
+        self.admin_request(
+            method='HEAD',
+            path='/v2.0/tokens/%(token_id)s' % {
                 'token_id': token,
             },
             token=token,
@@ -400,7 +412,8 @@ class CoreApiTests(object):
         raise nose.exc.SkipTest('Blocked by bug 933555')
 
         token = self.get_scoped_token()
-        r = self.admin_request(path='/v2.0/tokens/%(token_id)s/endpoints' % {
+        r = self.admin_request(
+            path='/v2.0/tokens/%(token_id)s/endpoints' % {
                 'token_id': token,
             },
             token=token)
@@ -408,7 +421,8 @@ class CoreApiTests(object):
 
     def test_get_tenant(self):
         token = self.get_scoped_token()
-        r = self.admin_request(path='/v2.0/tenants/%(tenant_id)s' % {
+        r = self.admin_request(
+            path='/v2.0/tenants/%(tenant_id)s' % {
                 'tenant_id': self.tenant_bar['id'],
             },
             token=token)
@@ -418,7 +432,8 @@ class CoreApiTests(object):
         raise nose.exc.SkipTest('Blocked by bug 933565')
 
         token = self.get_scoped_token()
-        r = self.admin_request(path='/v2.0/users/%(user_id)s/roles' % {
+        r = self.admin_request(
+            path='/v2.0/users/%(user_id)s/roles' % {
                 'user_id': self.user_foo['id'],
             },
             token=token)
@@ -436,7 +451,8 @@ class CoreApiTests(object):
 
     def test_get_user(self):
         token = self.get_scoped_token()
-        r = self.admin_request(path='/v2.0/users/%(user_id)s' % {
+        r = self.admin_request(
+            path='/v2.0/users/%(user_id)s' % {
                 'user_id': self.user_foo['id'],
             },
             token=token)
@@ -567,11 +583,11 @@ class JsonTestCase(RestfulTestCase, CoreApiTests):
         # values here don't matter because we should 401 before they're checked
         service_path = '/v2.0/OS-KSADM/services/%s' % uuid.uuid4().hex
         service_body = {
-                'OS-KSADM:service': {
-                    'name': uuid.uuid4().hex,
-                    'type': uuid.uuid4().hex,
-                    },
-                }
+            'OS-KSADM:service': {
+                'name': uuid.uuid4().hex,
+                'type': uuid.uuid4().hex,
+            },
+        }
 
         r = self.admin_request(method='GET',
                                path='/v2.0/OS-KSADM/services',
@@ -598,8 +614,8 @@ class JsonTestCase(RestfulTestCase, CoreApiTests):
         """User role list should 401 without an X-Auth-Token (bug 1006815)."""
         # values here don't matter because we should 401 before they're checked
         path = '/v2.0/tenants/%(tenant_id)s/users/%(user_id)s/roles' % {
-                'tenant_id': uuid.uuid4().hex,
-                'user_id': uuid.uuid4().hex,
+            'tenant_id': uuid.uuid4().hex,
+            'user_id': uuid.uuid4().hex,
         }
 
         r = self.admin_request(path=path, expected_status=401)