diff options
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/_ldap_livetest.py | 3 | ||||
| -rw-r--r-- | tests/test_backend_ldap.py | 2 | ||||
| -rw-r--r-- | tests/test_backend_sql.py | 7 | ||||
| -rw-r--r-- | tests/test_setup.py | 8 | ||||
| -rw-r--r-- | tests/test_swift_auth_middleware.py | 3 |
5 files changed, 12 insertions, 11 deletions
diff --git a/tests/_ldap_livetest.py b/tests/_ldap_livetest.py index df417c06..6a4420b8 100644 --- a/tests/_ldap_livetest.py +++ b/tests/_ldap_livetest.py @@ -15,7 +15,6 @@ # under the License. import subprocess -import nose.exc from keystone import config from keystone import test @@ -43,7 +42,7 @@ def delete_object(name): def clear_live_database(): roles = ['keystone_admin'] groups = ['baz', 'bar', 'tenent4add', 'fake1', 'fake2'] - users = ['foo', 'two', 'fake1', 'fake2','no_meta'] + users = ['foo', 'two', 'fake1', 'fake2', 'no_meta'] roles = ['keystone_admin', 'useless'] for group in groups: diff --git a/tests/test_backend_ldap.py b/tests/test_backend_ldap.py index d225d02c..0c882b67 100644 --- a/tests/test_backend_ldap.py +++ b/tests/test_backend_ldap.py @@ -14,8 +14,6 @@ # License for the specific language governing permissions and limitations # under the License. -import nose.exc - from keystone import config from keystone import test from keystone.common.ldap import fakeldap diff --git a/tests/test_backend_sql.py b/tests/test_backend_sql.py index c9644072..d600e772 100644 --- a/tests/test_backend_sql.py +++ b/tests/test_backend_sql.py @@ -114,7 +114,8 @@ class SqlIdentity(test.TestCase, test_backend.IdentityTests): self.tenant_bar['id'], {'extra': 'extra'}) self.identity_api.delete_user(user['id']) - metadata = self.identity_api.get_metadata(user['id'], self.tenant_bar['id']) + metadata = self.identity_api.get_metadata(user['id'], + self.tenant_bar['id']) self.assertEquals(metadata, {}) def test_delete_tenant_with_metadata(self): @@ -126,9 +127,11 @@ class SqlIdentity(test.TestCase, test_backend.IdentityTests): self.tenant_bar['id'], {'extra': 'extra'}) self.identity_api.delete_tenant(self.tenant_bar['id']) - metadata = self.identity_api.get_metadata(user['id'], self.tenant_bar['id']) + metadata = self.identity_api.get_metadata(user['id'], + self.tenant_bar['id']) self.assertEquals(metadata, {}) + class SqlToken(test.TestCase, test_backend.TokenTests): def setUp(self): super(SqlToken, self).setUp() diff --git a/tests/test_setup.py b/tests/test_setup.py index 0b9906dc..ff64903d 100644 --- a/tests/test_setup.py +++ b/tests/test_setup.py @@ -30,25 +30,25 @@ class SetupTest(unittest.TestCase): def test_str_dict_replace(self): string = 'Johnnie T. Hozer' mapping = {'T.': 'The'} - self.assertEqual('Johnnie The Hozer', + self.assertEqual('Johnnie The Hozer', canonicalize_emails(string, mapping)) def test_mailmap_with_fullname(self): with open(self.mailmap, 'w') as mm_fh: mm_fh.write("Foo Bar <email@foo.com> Foo Bar <email@bar.com>\n") - self.assertEqual({'<email@bar.com>' : '<email@foo.com>'}, + self.assertEqual({'<email@bar.com>': '<email@foo.com>'}, parse_mailmap(self.mailmap)) def test_mailmap_with_firstname(self): with open(self.mailmap, 'w') as mm_fh: mm_fh.write("Foo <email@foo.com> Foo <email@bar.com>\n") - self.assertEqual({'<email@bar.com>' : '<email@foo.com>'}, + self.assertEqual({'<email@bar.com>': '<email@foo.com>'}, parse_mailmap(self.mailmap)) def test_mailmap_with_noname(self): with open(self.mailmap, 'w') as mm_fh: mm_fh.write("<email@foo.com> <email@bar.com>\n") - self.assertEqual({'<email@bar.com>' : '<email@foo.com>'}, + self.assertEqual({'<email@bar.com>': '<email@foo.com>'}, parse_mailmap(self.mailmap)) def tearDown(self): diff --git a/tests/test_swift_auth_middleware.py b/tests/test_swift_auth_middleware.py index ea585a76..0f47e424 100644 --- a/tests/test_swift_auth_middleware.py +++ b/tests/test_swift_auth_middleware.py @@ -26,6 +26,7 @@ from keystone.middleware import swift_auth def setUpModule(self): self.stubs = stubout.StubOutForTesting() + # Stub out swift_utils.get_logger. get_logger tries to configure # syslogging to '/dev/log', which will fail on OS X. def fake_get_logger(config, log_route=None): @@ -156,7 +157,7 @@ class TestAuthorize(unittest.TestCase): exception=webob.exc.HTTPForbidden) def test_authorize_succeeds_for_reseller_admin(self): - roles =[self.test_auth.reseller_admin_role] + roles = [self.test_auth.reseller_admin_role] identity = self._get_identity(roles=roles) req = self._check_authenticate(identity=identity) self.assertTrue(req.environ.get('swift_owner')) |