Refactoring of unit tests helper

python/ccdb/sql/mysql_schema.py

@@ -355,6 +355,7 @@ def init_mysql_database(engine, tables_dict=None):
             except SQLAlchemyError as e:
                 print(f"Error processing table '{table_name}': {str(e)}")
 
+
 def generate_mysql_sql_file(tables_dict, file_path='mysql_setup.sql'):
     """
     Generate a MySQL .sql file with drop, create, and insert commands

python/tests/helper.py → python/ccdb/testing.py

@@ -1,3 +1,6 @@
+# There are a number of tools and configs for unit testing which is convenient to have in ccdb package.
+# The unit tests and integration tests are located outside of the package
+
 import inspect
 import os
 import shutil
@@ -33,9 +36,11 @@
 # SQLite connection string for tests
 sqlite_test_file_path = os.path.join(os.getcwd(), 'test.sqlite')
 
+
 # SQLite connection string for tests
 sqlite_test_connection_str = "sqlite:///" + os.path.join(ccdb_path, 'sql', 'ccdb.sqlite')
 
+
 def recreate_mysql_db(connection_str):
     """ Erases the test database and put it to default conditions """
 
@@ -50,10 +55,7 @@ def recreate_mysql_db(connection_str):
     cli.process_command_line("db init --init-i-am-sure")
 
 
-
-
-
-def recreate_mysql_db2(connection_string='mysql+pymysql://ccdb_user@localhost/ccdb_test'):
+def recreate_mysql_db2(connection_string):
     from sqlalchemy import create_engine, text
     from sqlalchemy.exc import SQLAlchemyError
 

python/run_unit_tests.py

@@ -1,8 +1,6 @@
-import glob
 import unittest
-import inspect
 import os
-import tests
+from ccdb import testing as ccdb_testing
 
 test_names = [
     'unit_test_authentication',
@@ -33,7 +31,16 @@ def run_unit_tests():
 
 
 if __name__ == "__main__":
-    script_dir = os.path.dirname(os.path.abspath(inspect.getfile(inspect.currentframe())))
+
+    if ccdb_testing.ENV_TEST_MYSQL not in os.environ:
+        print(f"(!)WARNING(!) TESTS Mysql Connection string is not set in {ccdb_testing.ENV_TEST_MYSQL}")
+        print(f"Using default: {ccdb_testing.mysql_test_connection_str}")
+
+    if ccdb_testing.ENV_TEST_SQLITE not in os.environ:
+        print(f"(!)WARNING(!) TESTS SQLite Connection string is not set in {ccdb_testing.ENV_TEST_SQLITE}")
+        print(f"Using default: {ccdb_testing.sqlite_test_file_path}")
+
+    script_dir = os.path.dirname(os.path.abspath(__file__))
     unit_test_dir = os.path.join(script_dir, "tests")
     os.chdir(unit_test_dir)
     run_unit_tests()

python/tests/integ_test_cli_manager.py

@@ -15,10 +15,8 @@
 import ccdb.path_utils
 import ccdb.cmd.themes
 from ccdb.cmd.cli_manager import CliManager, CCDB_EXCEPTIONS_THROW
-try:
-    from . import helper
-except:
-    import helper
+from ccdb import testing as helper
+
 
 logger = logging.getLogger("ccdb")
 

python/tests/integ_test_provider_mysql.py

@@ -1,15 +1,14 @@
 from ccdb.errors import DatabaseStructureError
 from ccdb.errors import AnonymousUserForbiddenError
+from ccdb import testing as helper
+import unittest
+import ccdb
 
+# Have to import it this way as tests may be considered a package or not depending on context
 try:
     from . import provider_fixture
-    from . import helper
 except:
     import provider_fixture
-    import helper
-
-import unittest
-import ccdb
 
 
 class MySQLAlchemyProviderTest(provider_fixture.AlchemyProviderTest):

python/tests/integ_test_provider_sqlite.py

@@ -2,12 +2,13 @@
 
 from ccdb import get_ccdb_home_path
 from ccdb.errors import DatabaseStructureError
+from ccdb import testing as helper
+
+# Have to import it this way as tests may be considered a package or not depending on context
 try:
     from . import provider_fixture
-    from . import helper
 except:
     import provider_fixture
-    import helper
 
 
 # noinspection PyPep8Naming

python/tests/provider_fixture.py

@@ -9,12 +9,7 @@
 
 from ccdb import AlchemyProvider
 from ccdb.path_utils import ParseRequestResult
-
-try:
-    from . import helper
-except ImportError:
-    import helper
-
+from ccdb import testing as helper
 
 class AlchemyProviderTest(unittest.TestCase):
     ccdb_path = get_ccdb_home_path()

python/tests/unit_test_dump_comments.py

@@ -8,11 +8,7 @@
 import ccdb.path_utils
 import ccdb.cmd.themes
 from ccdb.cmd.cli_manager import CliManager, CCDB_EXCEPTIONS_THROW
-
-try:
-    from . import helper
-except ImportError:
-    import helper
+from ccdb import testing as helper
 
 logger = logging.getLogger("ccdb")