diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-09-14 19:28:08 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-09-14 19:28:08 +0000 |
| commit | 5b9633dddb631f6b5931f284131e4e99d5db8dff (patch) | |
| tree | 08a6ac948e2f593de4b5d8f531ca1b8e98fb04db | |
| parent | 7991f129b6cb376689bf68330914b3d2d2a9dfaa (diff) | |
| parent | e501a565ae6d181b5ac0ec781300e3bbc5683302 (diff) | |
| download | oslo-db-5b9633dddb631f6b5931f284131e4e99d5db8dff.tar.gz | |
Merge "Handle case where oslo_db.tests has not been imported"
| -rw-r--r-- | oslo_db/sqlalchemy/engines.py | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/oslo_db/sqlalchemy/engines.py b/oslo_db/sqlalchemy/engines.py index 84e4d12..e7681b6 100644 --- a/oslo_db/sqlalchemy/engines.py +++ b/oslo_db/sqlalchemy/engines.py @@ -377,9 +377,12 @@ def _add_trace_comments(engine): os.path.dirname(sys.modules['oslo_db'].__file__), os.path.dirname(sys.modules['sqlalchemy'].__file__) ]) - skip_paths = set([ - os.path.dirname(sys.modules['oslo_db.tests'].__file__), - ]) + try: + skip_paths = set([ + os.path.dirname(sys.modules['oslo_db.tests'].__file__), + ]) + except KeyError: + skip_paths = set() @sqlalchemy.event.listens_for(engine, "before_cursor_execute", retval=True) def before_cursor_execute(conn, cursor, statement, parameters, context, |