re-activate mysql tests

pwman/tests/test_mysql.py

@@ -23,11 +23,11 @@ if sys.version_info.major > 2:  # pragma: no cover
     from urllib.parse import urlparse
 else:  # pragma: no cover
     from urlparse import urlparse
+
 if sys.version_info.major > 2:
-    import pymysql as mysql
-    mysql.install_as_MySQLdb()
+    from pymysql import connections
 else:
-    import MySQLdb as mysql
+    from MySQLdb import connections
 from pwman.data.drivers.mysql import MySQLDatabase
 from pwman.util.crypto_engine import CryptoEngine
 
@@ -53,7 +53,7 @@ class TestMySQLDatabase(unittest.TestCase):
         self.db._con.commit()
 
     def test_1_con(self):
-        self.assertIsInstance(self.db._con, mysql.connections.Connection)
+        self.assertIsInstance(self.db._con, connections.Connection)
 
     def test_2_create_tables(self):
         self.db._create_tables()

pwman/tests/test_pwman.py

@@ -26,7 +26,7 @@ from .test_crypto_engine import CryptoEngineTest, TestPassGenerator
 from .test_config import TestConfig
 from .test_sqlite import TestSQLite
 from .test_postgresql import TestPostGresql
-#from .test_mysql import TestMySQLDatabase
+from .test_mysql import TestMySQLDatabase
 from .test_importer import TestImporter
 from .test_factory import TestFactory
 from .test_base_ui import TestBaseUI
@@ -56,7 +56,7 @@ def suite():
     suite.addTest(loader.loadTestsFromTestCase(TestConfig))
     suite.addTest(loader.loadTestsFromTestCase(TestSQLite))
     suite.addTest(loader.loadTestsFromTestCase(TestPostGresql))
-    #suite.addTest(loader.loadTestsFromTestCase(TestMySQLDatabase))
+    suite.addTest(loader.loadTestsFromTestCase(TestMySQLDatabase))
     suite.addTest(loader.loadTestsFromTestCase(TestImporter))
     suite.addTest(loader.loadTestsFromTestCase(TestFactory))
     suite.addTest(loader.loadTestsFromTestCase(TestBaseUI))