summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2015-02-05 15:19:38 +0000
committerGerrit Code Review <review@openstack.org>2015-02-05 15:19:38 +0000
commite92ede64cb893ea6ff940c19bff8fa55dfec1dc0 (patch)
tree164e105a50036cfe65b7d5c802a8f61131d090b4
parent055de25dc687482a76cbce6062dc930e39f28561 (diff)
parentefdefa93723b5429759190b584f274be03a88f81 (diff)
downloadoslo-db-e92ede64cb893ea6ff940c19bff8fa55dfec1dc0.tar.gz
Merge "Fix PatchStacktraceTest for pypy"
-rw-r--r--oslo_db/tests/sqlalchemy/test_sqlalchemy.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/oslo_db/tests/sqlalchemy/test_sqlalchemy.py b/oslo_db/tests/sqlalchemy/test_sqlalchemy.py
index 7acbc1e..bcc4a1c 100644
--- a/oslo_db/tests/sqlalchemy/test_sqlalchemy.py
+++ b/oslo_db/tests/sqlalchemy/test_sqlalchemy.py
@@ -665,9 +665,11 @@ class PatchStacktraceTest(test_base.DbTestCase):
session._add_trace_comments(engine)
conn = engine.connect()
+ orig_do_exec = engine.dialect.do_execute
with mock.patch.object(engine.dialect, "do_execute") as mock_exec:
- conn.execute("select * from table")
+ mock_exec.side_effect = orig_do_exec
+ conn.execute("select 1;")
call = mock_exec.mock_calls[0]