Fixing pep8 errors in tests/*py

Fixes bug 1022575

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

Change-Id: I2d7dec0a87f1ae9b5f828d7f321b65bf8c06a421

tests/default_fixtures.py

@@ -18,7 +18,7 @@ TENANTS = [
     {'id': 'bar', 'name': 'BAR'},
     {'id': 'baz', 'name': 'BAZ'},
     {'id': 'tenent4add', 'name': 'tenant4add'},
-    ]
+]
 
 # NOTE(ja): a role of keystone_admin and attribute "is_admin" is done in setUp
 USERS = [
@@ -28,17 +28,17 @@ USERS = [
      'name': 'NO_META',
      'password': 'no_meta2',
      'tenants': ['baz']},
-    ]
+]
 
 METADATA = [
     {'user_id': 'foo', 'tenant_id': 'bar', 'extra': 'extra'},
     {'user_id': 'two', 'tenant_id': 'baz', 'extra': 'extra'},
-    ]
+]
 
 ROLES = [
     {'id': 'keystone_admin', 'name': 'Keystone Admin'},
     {'id': 'useless', 'name': 'Useless'},
-    ]
+]
 
 SERVICES = [
     {

tests/test_backend.py

@@ -179,10 +179,14 @@ class IdentityTests(object):
                           role)
 
     def test_rename_duplicate_role_name_fails(self):
-        role1 = {'id': 'fake1',
-                'name': 'fake1name'}
-        role2 = {'id': 'fake2',
-                'name': 'fake2name'}
+        role1 = {
+            'id': 'fake1',
+            'name': 'fake1name'
+        }
+        role2 = {
+            'id': 'fake2',
+            'name': 'fake2name'
+        }
         self.identity_api.create_role('fake1', role1)
         self.identity_api.create_role('fake2', role2)
         role1['name'] = 'fake2name'
@@ -572,8 +576,12 @@ class TokenTests(object):
 
 class CatalogTests(object):
     def test_service_crud(self):
-        new_service = {'id': 'MY_SERVICE', 'type': 'myservice',
-            'name': 'My Service', 'description': 'My description'}
+        new_service = {
+            'id': 'MY_SERVICE',
+            'type': 'myservice',
+            'name': 'My Service',
+            'description': 'My description'
+        }
         res = self.catalog_api.create_service(new_service['id'], new_service)
         self.assertDictEqual(res, new_service)
 

tests/test_backend_ldap.py

@@ -55,10 +55,14 @@ class LDAPIdentity(test.TestCase, test_backend.IdentityTests):
                           uuid.uuid4().hex)
 
     def test_rename_duplicate_role_name_fails(self):
-        role1 = {'id': 'fake1',
-                'name': 'fake1name'}
-        role2 = {'id': 'fake2',
-                'name': 'fake2name'}
+        role1 = {
+            'id': 'fake1',
+            'name': 'fake1name'
+        }
+        role2 = {
+            'id': 'fake2',
+            'name': 'fake2name'
+        }
         self.identity_api.create_role('fake1', role1)
         self.identity_api.create_role('fake2', role2)
         role1['name'] = 'fake2name'

tests/test_content_types.py

@@ -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'],
@@ -361,7 +370,8 @@ class CoreApiTests(object):
 
     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)

tests/test_s3_token_middleware.py

@@ -28,10 +28,8 @@ from keystone.openstack.common import jsonutils
 
 def denied_request(code):
     error_table = {
-        'AccessDenied':
-            (401, 'Access denied'),
-        'InvalidURI':
-            (400, 'Could not parse the specified URI'),
+        'AccessDenied': (401, 'Access denied'),
+        'InvalidURI': (400, 'Could not parse the specified URI'),
     }
     xml = '<?xml version="1.0" encoding="UTF-8"?>\r\n<Error>\r\n  ' \
         '<Code>%s</Code>\r\n  <Message>%s</Message>\r\n</Error>\r\n' \

tests/test_ssl.py

@@ -62,10 +62,12 @@ class SSLTestCase(test.TestCase):
         Make sure both public and admin API work with 2-way SSL.  Requires
         client certificate.
         """
-        self.public_server = self.serveapp('keystone', name='main',
-            cert=CERT, key=KEY, ca=CA, cert_required=True)
-        self.admin_server = self.serveapp('keystone', name='admin',
-            cert=CERT, key=KEY, ca=CA, cert_required=True)
+        self.public_server = self.serveapp(
+            'keystone', name='main', cert=CERT,
+            key=KEY, ca=CA, cert_required=True)
+        self.admin_server = self.serveapp(
+            'keystone', name='admin', cert=CERT,
+            key=KEY, ca=CA, cert_required=True)
         # Verify Admin
         conn = httplib.HTTPSConnection(
             '127.0.0.1', CONF.admin_port, CLIENT, CLIENT)
@@ -83,10 +85,12 @@ class SSLTestCase(test.TestCase):
         """
         Expect to fail when client does not present proper certificate.
         """
-        self.public_server = self.serveapp('keystone', name='main',
-            cert=CERT, key=KEY, ca=CA, cert_required=True)
-        self.admin_server = self.serveapp('keystone', name='admin',
-            cert=CERT, key=KEY, ca=CA, cert_required=True)
+        self.public_server = self.serveapp(
+            'keystone', name='main', cert=CERT,
+            key=KEY, ca=CA, cert_required=True)
+        self.admin_server = self.serveapp(
+            'keystone', name='admin', cert=CERT,
+            key=KEY, ca=CA, cert_required=True)
         # Verify Admin
         conn = httplib.HTTPSConnection('127.0.0.1', CONF.admin_port)
         try: