diff options
| author | Monty Taylor <mordred@inaugust.com> | 2013-08-13 23:50:17 -0300 |
|---|---|---|
| committer | Morgan Fainberg <m@metacloud.com> | 2013-08-15 19:30:36 -0700 |
| commit | fa95c8bdc2e17b54ef6ff69e2e23b1faeb6a112a (patch) | |
| tree | b015016f55aea2c262f5d4cec06b662382c43961 /keystone/tests | |
| parent | 7851a3cd62aa598c694bd51806f55ec26d3a54fe (diff) | |
| download | keystone-fa95c8bdc2e17b54ef6ff69e2e23b1faeb6a112a.tar.gz keystone-fa95c8bdc2e17b54ef6ff69e2e23b1faeb6a112a.tar.xz keystone-fa95c8bdc2e17b54ef6ff69e2e23b1faeb6a112a.zip | |
Clean hacking errors in advance of hacking update
The next patch syncs with global requirements, including an
update to hacking. These fixes align the codebase with those
new rules.
Change-Id: I16e5a4ffa877fb46d2fb28d881642185c801b628
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") |