summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2014-08-22 21:42:05 +0000
committerGerrit Code Review <review@openstack.org>2014-08-22 21:42:05 +0000
commit65852717835be59c8bbc4ba3b0f2a8c707702726 (patch)
tree052f6b84a192ecbaf2987acf927350ec9174f176
parent5ab43eefa50186bd5c7520b341f7499e3fc0601a (diff)
parent686005e35e2018c79cd43a62bad96d06aa5a0ea1 (diff)
downloadoslo-db-65852717835be59c8bbc4ba3b0f2a8c707702726.tar.gz
Merge "Added check to see whether oslotest is installed"
-rw-r--r--oslo/db/sqlalchemy/test_base.py8
1 files changed, 7 insertions, 1 deletions
diff --git a/oslo/db/sqlalchemy/test_base.py b/oslo/db/sqlalchemy/test_base.py
index 544568e..849e726 100644
--- a/oslo/db/sqlalchemy/test_base.py
+++ b/oslo/db/sqlalchemy/test_base.py
@@ -18,7 +18,13 @@ import functools
import os
import fixtures
-from oslotest import base as test_base
+
+try:
+ from oslotest import base as test_base
+except ImportError:
+ raise NameError('Oslotest is not installed. Please add oslotest in your'
+ ' test-requirements')
+
import six
from oslo.db.sqlalchemy import provision