web2py.py --run_system_tests, thanks Marc Abramowitz

gluon/contrib/pymysql/tests/__init__.py

@@ -1,6 +1,6 @@
-from pymysql.tests.test_issues import *
-from pymysql.tests.test_example import *
-from pymysql.tests.test_basic import *
+from gluon.contrib.pymysql.tests.test_issues import *
+from gluon.contrib.pymysql.tests.test_example import *
+from gluon.contrib.pymysql.tests.test_basic import *
 
 if __name__ == "__main__":
     import unittest

gluon/contrib/pymysql/tests/base.py

@@ -1,4 +1,4 @@
-import pymysql
+from gluon.contrib import pymysql
 import unittest
 
 class PyMySQLTestCase(unittest.TestCase):
@@ -8,10 +8,13 @@ class PyMySQLTestCase(unittest.TestCase):
         {"host":"localhost","user":"root","passwd":"","db":"test_pymysql2"}]
 
     def setUp(self):
-        self.connections = []
+        try:
+            self.connections = []
 
-        for params in self.databases:
-            self.connections.append(pymysql.connect(**params))
+            for params in self.databases:
+                self.connections.append(pymysql.connect(**params))
+        except pymysql.err.OperationalError as e:
+            self.skipTest('Cannot connect to MySQL - skipping pymysql tests because of (%s) %s' % (type(e), e))
 
     def tearDown(self):
         for connection in self.connections:

gluon/contrib/pymysql/tests/test_basic.py

@@ -1,5 +1,5 @@
-from pymysql.tests import base
-from pymysql import util
+from gluon.contrib.pymysql.tests import base
+from gluon.contrib.pymysql import util
 
 import time
 import datetime

gluon/contrib/pymysql/tests/test_example.py

@@ -1,5 +1,5 @@
-import pymysql
-from pymysql.tests import base
+from gluon.contrib import pymysql
+from gluon.contrib.pymysql.tests import base
 
 class TestExample(base.PyMySQLTestCase):
     def test_example(self):

gluon/contrib/pymysql/tests/test_issues.py

@@ -1,5 +1,5 @@
-import pymysql
-from pymysql.tests import base
+from gluon.contrib import pymysql
+from gluon.contrib.pymysql.tests import base
 
 import sys