Migrate all tests to top level

Makefile

@@ -33,12 +33,13 @@ clean-pyc:
 	find . -name '*.pyc' -exec rm -f {} +
 	find . -name '*.pyo' -exec rm -f {} +
 	find . -name '*~' -exec rm -f {} +
+	find . -name '__pycache__' -exec rm -rf {} +
 
 lint:
 	flake8 pwman scripts
 
 test: install clean
-	git checkout pwman/tests/pwman.v0.0.8.db
+	git checkout tests/pwman.v0.0.8.db
 	python setup.py test
 	@rm -f pwman/tests/test.conf
 

pwman/tests/__init__.py

@@ -1,13 +0,0 @@
-import unittest
-from . import test_pwman
-
-
-def suite():
-    import unittest
-    suite = unittest.TestSuite()
-    suite.addTests(test_pwman.suite())
-    return suite
-
-
-if __name__ == '__main__':
-    unittest.TextTestRunner(verbosity=2).run(suite())

setup.py

@@ -340,12 +340,7 @@ setup(name=pwman.appname,
       author_email=pwman.authoremail,
       url=pwman.website,
       license="GNU GPL",
-      packages=['pwman',
-                'pwman.data',
-                'pwman.data.drivers',
-                'pwman.exchange',
-                'pwman.ui',
-                'pwman.util'],
+      packages=['pwman'],
       package_data={"data": ["documentation"]},
       include_package_data=True,
       scripts=['scripts/pwman3'],
@@ -366,7 +361,7 @@ setup(name=pwman.appname,
                    'Programming Language :: Python :: 3.3',
                    'Programming Language :: Python :: 3.4',
                    ],
-      test_suite='pwman.tests.suite',
+      test_suite='tests.test_pwman.suite',
       tests_require=test_requirements,
       cmdclass={
           'install_pycrypto': PyCryptoInstallCommand,

tests/__init__.py

@@ -0,0 +1 @@
+

pwman/tests/test_mysql.py → tests/test_mysql.py

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

pwman/tests/test_pwman.py → tests/test_pwman.py

@@ -65,11 +65,3 @@ def suite():
     # if 'win' not in sys.platform:
     #    suite.addTest(loader.loadTestsFromTestCase(Ferrum))
     return suite
-
-if __name__ == '__main__':
-    try:
-        unittest.TextTestRunner(verbosity=2, failfast=True).run(suite())
-    except SystemExit:
-        TestConfig.clean_all()
-        TestBaseUI.clean_all()
-        TestImporter.clean_all()