Updated tests configuration, avoid circular imports with new dal

2014-12-15 22:37:34 +01:00
parent f60c1dff93
commit ad1fe87386
3 changed files with 7 additions and 55 deletions
@@ -1,4 +1,4 @@
-import os, sys
+import sys

 from test_http import *
 from test_cache import *
@@ -16,16 +16,7 @@ from test_validators import *
 from test_utils import *
 from test_contribs import *
 from test_web import *
-
+from test_dal import *

 if sys.version[:3] == '2.7':
    from test_old_doctests import *
-
-
-NOSQL = any([name in (os.getenv("DB") or "")
-            for name in ("datastore", "mongodb", "imap")])
-
-if NOSQL:
-    from test_dal_nosql import *
-else:
-    from test_dal import *