Tests: Even better balance using TEST_ACROSS_ALL_DBS

erezsh · erezsh · commit 32a491447df0 · 2022-11-02T17:41:51.000-03:00
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -51,4 +51,4 @@ jobs:
             DATADIFF_VERTICA_URI: 'vertica://vertica:Password1@localhost:5433/vertica'
         run: |
           chmod +x tests/waiting_for_stack_up.sh
-          ./tests/waiting_for_stack_up.sh && poetry run unittest-parallel -j 16
+          ./tests/waiting_for_stack_up.sh && TEST_ACROSS_ALL_DBS=0 poetry run unittest-parallel -j 16
diff --git a/.github/workflows/ci_full.yml b/.github/workflows/ci_full.yml
@@ -47,4 +47,4 @@ jobs:
             DATADIFF_VERTICA_URI: 'vertica://vertica:Password1@localhost:5433/vertica'
         run: |
           chmod +x tests/waiting_for_stack_up.sh
-          ./tests/waiting_for_stack_up.sh && FULL_TESTS=1 poetry run unittest-parallel -j 16
+          ./tests/waiting_for_stack_up.sh && TEST_ACROSS_ALL_DBS=full poetry run unittest-parallel -j 16
diff --git a/tests/common.py b/tests/common.py
@@ -36,7 +36,7 @@
 N_SAMPLES = int(os.environ.get("N_SAMPLES", DEFAULT_N_SAMPLES))
 BENCHMARK = os.environ.get("BENCHMARK", False)
 N_THREADS = int(os.environ.get("N_THREADS", 1))
-FULL_TESTS = bool(os.environ.get("FULL_TESTS", False))      # Should we run the full db<->db test suite?
+TEST_ACROSS_ALL_DBS = os.environ.get("TEST_ACROSS_ALL_DBS", True)  # Should we run the full db<->db test suite?
 
 
 def get_git_revision_short_hash() -> str:
@@ -95,8 +95,10 @@ def _print_used_dbs():
     logging.info(f"Testing databases: {', '.join(used)}")
     if unused:
         logging.info(f"Connection not configured; skipping tests for: {', '.join(unused)}")
-    if FULL_TESTS:
-        logging.info("Full tests enabled (every db<->db). May take very long when many dbs are involved.")
+    if TEST_ACROSS_ALL_DBS:
+        logging.info(
+            f"Full tests enabled (every db<->db). May take very long when many dbs are involved. ={TEST_ACROSS_ALL_DBS}"
+        )
 
 
 _print_used_dbs()
diff --git a/tests/test_database_types.py b/tests/test_database_types.py
@@ -25,7 +25,7 @@
     N_THREADS,
     BENCHMARK,
     GIT_REVISION,
-    FULL_TESTS,
+    TEST_ACROSS_ALL_DBS,
     get_conn,
     random_table_suffix,
 )
@@ -420,27 +420,29 @@ def __iter__(self):
 }
 
 
-def _get_test_db_pairs(full):
-    if full:
+def _get_test_db_pairs():
+    if str(TEST_ACROSS_ALL_DBS).lower() == "full":
         for source_db in DATABASE_TYPES:
             for target_db in DATABASE_TYPES:
                 yield source_db, target_db
-    else:
+    elif int(TEST_ACROSS_ALL_DBS):
         for db_cls in DATABASE_TYPES:
             yield db_cls, db.PostgreSQL
             yield db.PostgreSQL, db_cls
             yield db_cls, db.Snowflake
             yield db.Snowflake, db_cls
+    else:
+        yield db.PostgreSQL, db.PostgreSQL
 
 
-def get_test_db_pairs(full=True):
-    active_pairs = {(db1, db2) for db1, db2 in _get_test_db_pairs(full) if db1 in CONN_STRINGS and db2 in CONN_STRINGS}
+def get_test_db_pairs():
+    active_pairs = {(db1, db2) for db1, db2 in _get_test_db_pairs() if db1 in CONN_STRINGS and db2 in CONN_STRINGS}
     for db1, db2 in active_pairs:
         yield db1, DATABASE_TYPES[db1], db2, DATABASE_TYPES[db2]
 
 
 type_pairs = []
-for source_db, source_type_categories, target_db, target_type_categories in get_test_db_pairs(FULL_TESTS):
+for source_db, source_type_categories, target_db, target_type_categories in get_test_db_pairs():
     for type_category, source_types in source_type_categories.items():  # int, datetime, ..
         for source_type in source_types:
             for target_type in target_type_categories[type_category]:
