diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-08-16 04:52:21 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-08-16 04:52:21 +0000 |
| commit | d695d4a3cd747ba47e2dfa1ca7e688175cbd06be (patch) | |
| tree | 265ebe221e20cec12973a0009422d90e96df8cef /keystone/tests | |
| parent | 6d174d8e301ee31d06f2406767fcfb08d65a21f7 (diff) | |
| parent | fa95c8bdc2e17b54ef6ff69e2e23b1faeb6a112a (diff) | |
Merge "Clean hacking errors in advance of hacking update"
Diffstat (limited to 'keystone/tests')
| -rw-r--r-- | keystone/tests/test_s3_token_middleware.py | 4 | ||||
| -rw-r--r-- | keystone/tests/test_sql_upgrade.py | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/keystone/tests/test_s3_token_middleware.py b/keystone/tests/test_s3_token_middleware.py index ec31f2ac..2d561c10 100644 --- a/keystone/tests/test_s3_token_middleware.py +++ b/keystone/tests/test_s3_token_middleware.py @@ -225,9 +225,9 @@ class S3TokenMiddlewareTestUtil(unittest.TestCase): def test_split_path_invalid_path(self): try: s3_token.split_path('o\nn e', 2) - except ValueError, err: + except ValueError as err: self.assertEquals(str(err), 'Invalid path: o%0An%20e') try: s3_token.split_path('o\nn e', 2, 3, True) - except ValueError, err: + except ValueError as err: self.assertEquals(str(err), 'Invalid path: o%0An%20e') diff --git a/keystone/tests/test_sql_upgrade.py b/keystone/tests/test_sql_upgrade.py index 7d60ced4..0ee63433 100644 --- a/keystone/tests/test_sql_upgrade.py +++ b/keystone/tests/test_sql_upgrade.py @@ -1398,7 +1398,7 @@ class SqlUpgradeTests(SqlMigrateBase): total = connection.execute("SELECT count(*) " "from information_schema.TABLES " "where TABLE_SCHEMA='%(database)s'" % - locals()) + dict(database=database)) self.assertTrue(total.scalar() > 0, "No tables found. Wrong schema?") noninnodb = connection.execute("SELECT table_name " @@ -1406,7 +1406,7 @@ class SqlUpgradeTests(SqlMigrateBase): "where TABLE_SCHEMA='%(database)s' " "and ENGINE!='InnoDB' " "and TABLE_NAME!='migrate_version'" % - locals()) + dict(database=database)) names = [x[0] for x in noninnodb] self.assertEqual(names, [], "Non-InnoDB tables exist") |