summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMorgan Fainberg <m@metacloud.com>2014-03-01 21:31:54 -0800
committerMorgan Fainberg <m@metacloud.com>2014-03-01 23:26:28 -0800
commit622606d7b4cc9639de99ddea3848c184daa80c69 (patch)
treea181972ba0433a63371be059046a1abc750337fc
parent42e23753f082afd2048b358af67750c2bd252f49 (diff)
downloadkeystone-622606d7b4cc9639de99ddea3848c184daa80c69.tar.gz
SQLAlchemy Change to support more strict dialect checking
Update a couple DELETE operations within the test_sql_upgrade test case to support the more strict dialect checking that occurs in 0.9.3 of SQLAlchemy for "additional arguments". Closes-Bug: #1286717 Change-Id: I82b57257a8b49d798d813c65e76757021676ba90
-rw-r--r--keystone/tests/test_sql_upgrade.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/keystone/tests/test_sql_upgrade.py b/keystone/tests/test_sql_upgrade.py
index 9f45e6901..3498509ac 100644
--- a/keystone/tests/test_sql_upgrade.py
+++ b/keystone/tests/test_sql_upgrade.py
@@ -884,7 +884,7 @@ class SqlUpgradeTests(SqlMigrateBase):
# two uses with clashing name as we try to revert to a single global
# name space. This limitation is raised as Bug #1125046 and the delete
# could be removed depending on how that bug is resolved.
- cmd = this_table.delete(id=user['id'])
+ cmd = this_table.delete().where(this_table.c.id == user['id'])
self.engine.execute(cmd)
# Now, the Project table.
@@ -908,7 +908,7 @@ class SqlUpgradeTests(SqlMigrateBase):
# TODO(henry-nash): For now, we delete one of the projects for the same
# reason as we delete one of the users (Bug #1125046). This delete
# could be removed depending on that bug resolution.
- cmd = this_table.delete(id=project['id'])
+ cmd = this_table.delete().where(this_table.c.id == project['id'])
self.engine.execute(cmd)
def test_upgrade_trusts(self):