Updated tests configuration, avoid circular imports with new dal

gluon/globals.py

@@ -25,7 +25,6 @@ from gluon.serializers import json, custom_json
 import gluon.settings as settings
 from gluon.utils import web2py_uuid, secure_dumps, secure_loads
 from gluon.settings import global_settings
-from gluon.dal import Field
 from gluon import recfile
 import hashlib
 import portalocker
@@ -767,6 +766,7 @@ class Session(Storage):
             compression_level(int): 0-9, sets zlib compression on the data
                 before the encryption
         """
+        from gluon.dal import Field
         request = request or current.request
         response = response or current.response
         masterapp = masterapp or request.application

gluon/tests/__init__.py

@@ -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 *