NoSQL dal tests

gluon/tests/__init__.py

@@ -1,6 +1,13 @@
+import os, sys
+
 from test_http import *
 from test_cache import *
-from test_dal import *
+
+if "google" in os.getenv("DB"):
+    from test_dal_nosql import *
+else:
+    from test_dal import *
+
 from test_html import *
 from test_is_url import *
 from test_languages import *
@@ -13,6 +20,6 @@ from test_utils import *
 from test_contribs import *
 from test_web import *
 
-import sys
+
 if sys.version[:3] == '2.7':
     from test_old_doctests import *

gluon/tests/test_dal.py

@@ -43,12 +43,12 @@ def fix_sys_path():
 
 fix_sys_path()
 
-from dal import DAL, Field, Table, SQLALL
-
 #for travis-ci
 DEFAULT_URI = os.environ.get('DB', 'sqlite:memory')
+
 print 'Testing against %s engine (%s)' % (DEFAULT_URI.partition(':')[0], DEFAULT_URI)
 
+from dal import DAL, Field, Table, SQLALL
 
 ALLOWED_DATATYPES = [
     'string',

gluon/tests/test_web.py

@@ -5,7 +5,10 @@
 """
 import sys
 import os
-import unittest
+if sys.version_info < (2, 7):
+    import unittest2 as unittest
+else:
+    import unittest
 import subprocess
 import time
 import signal
@@ -94,6 +97,8 @@ class LiveTest(unittest.TestCase):
     def tearDownClass(cls):
         stopwebserver()
 
+
+@unittest.skipIf("datastore" in os.getenv("DB", ""), "TODO: setup web test for app engine")
 class TestWeb(LiveTest):
     def testRegisterAndLogin(self):
         client = WebClient('http://127.0.0.1:8000/welcome/default/')