Update tests structre

Signed-off-by: Elron Bandel <[email protected]>
IBM · Jan 29, 2024 · 98a7d2d · 98a7d2d
1 parent 461998a
commit 98a7d2d
Show file tree

Hide file tree

Showing 34 changed files with 18 additions and 8 deletions.
diff --git a/.github/workflows/test_catalog.yml b/.github/workflows/test_catalog.yml
@@ -1,4 +1,4 @@
-name: Test Catalog
+name: Test Catalog Code
 
 on:
   push:
@@ -7,7 +7,7 @@ on:
     branches: [ main ]
 
 jobs:
-  run-all-preperation-snnipets:
+  run-catalog-artifacts-tests:
 
     runs-on: ubuntu-latest
     env:
@@ -30,5 +30,5 @@ jobs:
     - name: Generate Report
       env:
         HUGGINGFACE_HUB_TOKEN: ${{ secrets.UNITXT_READ_HUGGINGFACE_HUB_FOR_TESTS }}
-      run:  unittest-parallel -t . -s tests -p *test_preperation.py -j 10 --level test
+      run:  coverage run --omit=*/src -m unittest discover -s tests/catalog -p "test_*.py"
 
diff --git a/.github/workflows/unittests.yml → .github/workflows/test_library.yml b/.github/workflows/unittests.yml → .github/workflows/test_library.yml
@@ -7,7 +7,7 @@ on:
     branches: [ main ]
 
 jobs:
-  run-full-unit-tests-suit:
+  run-full-unit-tests-suite:
 
     runs-on: ubuntu-latest
     env:
@@ -30,7 +30,7 @@ jobs:
     - name: Generate Report
       env:
         HUGGINGFACE_HUB_TOKEN: ${{ secrets.UNITXT_READ_HUGGINGFACE_HUB_FOR_TESTS }}
-      run:  coverage run --omit=*/test_preparation.py -m unittest
+      run:  coverage run --omit=*/preperation -m unittest discover -s tests/library -p "test_*.py"
 
     - name: Upload Coverage to Codecov
       uses: codecov/codecov-action@v2
diff --git a/pyproject.toml b/pyproject.toml
@@ -36,8 +36,8 @@ target-version = "py38"
 "src/unitxt/metric.py" = ["F811", "F401"]
 "src/unitxt/dataset.py" = ["F811", "F401"]
 "src/unitxt/blocks.py" = ["F811", "F401"]
-"tests/test_loaders.py" = ["N802", "N803"]
-"tests/test_dataclass.py" = ["F811"]
+"tests/library/test_loaders.py" = ["N802", "N803"]
+"tests/library/test_dataclass.py" = ["F811"]
 "src/unitxt/validate.py" = ["B024"]
 "src/unitxt/type_utils.py" = ["C901"]
 "src/unitxt/dataclass.py" = ["C901"]
@@ -91,7 +91,9 @@ line-ending = "auto"
 [tool.ruff.lint.pydocstyle]
 convention = "google"
 
+
 [tool.coverage.run]
 omit = [
-    "*/test_preparation.py"
+    "preperation/*",
+    "docs/*"
 ]
diff --git a/tests/catalog/__init__.py b/tests/catalog/__init__.py
@@ -0,0 +1,4 @@
+from src.unitxt import artifact, logging_utils
+
+logging_utils.enable_explicit_format()
+artifact.enable_artifact_caching = False
diff --git a/tests/test_preperation.py → tests/catalog/test_preperation.py b/tests/test_preperation.py → tests/catalog/test_preperation.py
diff --git a/tests/library/__init__.py b/tests/library/__init__.py
@@ -0,0 +1,4 @@
+from src.unitxt import artifact, logging_utils
+
+logging_utils.enable_explicit_format()
+artifact.enable_artifact_caching = False
diff --git a/tests/test_artifact_recovery.py → tests/library/test_artifact_recovery.py b/tests/test_artifact_recovery.py → tests/library/test_artifact_recovery.py
diff --git a/tests/test_artifact_registration.py → tests/library/test_artifact_registration.py b/tests/test_artifact_registration.py → tests/library/test_artifact_registration.py
diff --git a/tests/test_card.py → tests/library/test_card.py b/tests/test_card.py → tests/library/test_card.py
diff --git a/tests/test_catalogs.py → tests/library/test_catalogs.py b/tests/test_catalogs.py → tests/library/test_catalogs.py
diff --git a/tests/test_collections.py → tests/library/test_collections.py b/tests/test_collections.py → tests/library/test_collections.py
diff --git a/tests/test_dataclass.py → tests/library/test_dataclass.py b/tests/test_dataclass.py → tests/library/test_dataclass.py
diff --git a/tests/test_dict_utils.py → tests/library/test_dict_utils.py b/tests/test_dict_utils.py → tests/library/test_dict_utils.py
diff --git a/tests/test_examples.py → tests/library/test_examples.py b/tests/test_examples.py → tests/library/test_examples.py
diff --git a/tests/test_formats.py → tests/library/test_formats.py b/tests/test_formats.py → tests/library/test_formats.py
diff --git a/tests/test_function_operators.py → tests/library/test_function_operators.py b/tests/test_function_operators.py → tests/library/test_function_operators.py
diff --git a/tests/test_fusion.py → tests/library/test_fusion.py b/tests/test_fusion.py → tests/library/test_fusion.py
diff --git a/tests/test_hf_artifacts.py → tests/library/test_hf_artifacts.py b/tests/test_hf_artifacts.py → tests/library/test_hf_artifacts.py
diff --git a/tests/test_hf_cache.py → tests/library/test_hf_cache.py b/tests/test_hf_cache.py → tests/library/test_hf_cache.py
diff --git a/tests/test_loaders.py → tests/library/test_loaders.py b/tests/test_loaders.py → tests/library/test_loaders.py
diff --git a/tests/test_metrics.py → tests/library/test_metrics.py b/tests/test_metrics.py → tests/library/test_metrics.py
diff --git a/tests/test_operators.py → tests/library/test_operators.py b/tests/test_operators.py → tests/library/test_operators.py
diff --git a/tests/test_postprocessors.py → tests/library/test_postprocessors.py b/tests/test_postprocessors.py → tests/library/test_postprocessors.py
diff --git a/tests/test_query.py → tests/library/test_query.py b/tests/test_query.py → tests/library/test_query.py
diff --git a/tests/test_random_utils.py → tests/library/test_random_utils.py b/tests/test_random_utils.py → tests/library/test_random_utils.py
diff --git a/tests/test_randomization.py → tests/library/test_randomization.py b/tests/test_randomization.py → tests/library/test_randomization.py
diff --git a/tests/test_recipe.py → tests/library/test_recipe.py b/tests/test_recipe.py → tests/library/test_recipe.py
diff --git a/tests/test_splitters.py → tests/library/test_splitters.py b/tests/test_splitters.py → tests/library/test_splitters.py
diff --git a/tests/test_stream_caching.py → tests/library/test_stream_caching.py b/tests/test_stream_caching.py → tests/library/test_stream_caching.py
diff --git a/tests/test_tasks.py → tests/library/test_tasks.py b/tests/test_tasks.py → tests/library/test_tasks.py
diff --git a/tests/test_templates.py → tests/library/test_templates.py b/tests/test_templates.py → tests/library/test_templates.py
diff --git a/tests/test_text_utils.py → tests/library/test_text_utils.py b/tests/test_text_utils.py → tests/library/test_text_utils.py
diff --git a/tests/test_type_utils.py → tests/library/test_type_utils.py b/tests/test_type_utils.py → tests/library/test_type_utils.py
diff --git a/tests/unitxt_test_case.py → tests/library/unitxt_test_case.py b/tests/unitxt_test_case.py → tests/library/unitxt_test_case.py