Refactor tests to be separated from application code (#313)

Closes: #302 --------- Co-authored-by: Julian LaNeve <[email protected]>
astronomer · Jun 8, 2023 · 4e38f7b · 4e38f7b
1 parent 374f8a1
commit 4e38f7b
Show file tree

Hide file tree

Showing 40 changed files with 22 additions and 55 deletions.
diff --git a/.coveragerc b/.coveragerc
@@ -1,4 +1,3 @@
 [run]
 omit =
-        */test_*
-        cosmos/tests/utils.py
+        tests/*
diff --git a/cosmos/providers/dbt/dataset.py b/cosmos/providers/dbt/dataset.py
@@ -14,3 +14,6 @@ def __init__(self, id: str, *args, **kwargs):
 
         def __eq__(self, other) -> bool:
             return self.id == other.id
+
+
+__all__ = ["Dataset"]
diff --git a/cosmos/providers/dbt/tests/test_dataset.py b/cosmos/providers/dbt/tests/test_dataset.py
diff --git a/pyproject.toml b/pyproject.toml
@@ -155,7 +155,7 @@ matrix.airflow.dependencies = [
 [tool.hatch.envs.tests.scripts]
 freeze = "pip freeze"
 test = 'pytest -vv --durations=0 . -m "not integration"'
-test-cov = 'pytest -vv --cov=cosmos --cov-report=term-missing --cov-report=xml --durations=0 . -m "not integration"'
+test-cov = 'pytest -vv --cov=cosmos --cov-report=term-missing --cov-report=xml --durations=0 -m "not integration"'
 test-integration = "pytest -vv --cov=cosmos --cov-report=term-missing --cov-report=xml --durations=0 -m integration"
 
 [tool.pytest.ini_options]

diff --git a/cosmos/tests/__init__.py → tests/__init__.py b/cosmos/tests/__init__.py → tests/__init__.py
diff --git a/cosmos/conftest.py → tests/conftest.py b/cosmos/conftest.py → tests/conftest.py
diff --git a/tests/core/__init__.py b/tests/core/__init__.py
diff --git a/cosmos/core/tests/test_airflow.py → tests/core/test_airflow.py b/cosmos/core/tests/test_airflow.py → tests/core/test_airflow.py
diff --git a/tests/providers/__init__.py b/tests/providers/__init__.py
diff --git a/tests/providers/dbt/__init__.py b/tests/providers/dbt/__init__.py
diff --git a/tests/providers/dbt/core/__init__.py b/tests/providers/dbt/core/__init__.py
diff --git a/tests/providers/dbt/core/operators/__init__.py b/tests/providers/dbt/core/operators/__init__.py
diff --git a/...s/dbt/core/operators/tests/test_docker.py → ...oviders/dbt/core/operators/test_docker.py b/...s/dbt/core/operators/tests/test_docker.py → ...oviders/dbt/core/operators/test_docker.py
diff --git a/...t/core/operators/tests/test_kubernetes.py → ...ers/dbt/core/operators/test_kubernetes.py b/...t/core/operators/tests/test_kubernetes.py → ...ers/dbt/core/operators/test_kubernetes.py
diff --git a/...rs/dbt/core/operators/tests/test_local.py → ...roviders/dbt/core/operators/test_local.py b/...rs/dbt/core/operators/tests/test_local.py → ...roviders/dbt/core/operators/test_local.py
diff --git a/...t/core/operators/tests/test_virtualenv.py → ...ers/dbt/core/operators/test_virtualenv.py b/...t/core/operators/tests/test_virtualenv.py → ...ers/dbt/core/operators/test_virtualenv.py
diff --git a/tests/providers/dbt/core/profiles/__init__.py b/tests/providers/dbt/core/profiles/__init__.py
diff --git a/...ery/tests/test_bq_service_account_file.py → .../bigquery/test_bq_service_account_file.py b/...ery/tests/test_bq_service_account_file.py → .../bigquery/test_bq_service_account_file.py
diff --git a/...ofiles/databricks/tests/test_dbr_token.py → ...ore/profiles/databricks/test_dbr_token.py b/...ofiles/databricks/tests/test_dbr_token.py → ...ore/profiles/databricks/test_dbr_token.py
diff --git a/...les/exasol/tests/test_exasol_user_pass.py → .../profiles/exasol/test_exasol_user_pass.py b/...les/exasol/tests/test_exasol_user_pass.py → .../profiles/exasol/test_exasol_user_pass.py
diff --git a/...files/postgres/tests/test_pg_user_pass.py → ...re/profiles/postgres/test_pg_user_pass.py b/...files/postgres/tests/test_pg_user_pass.py → ...re/profiles/postgres/test_pg_user_pass.py
diff --git a/...redshift/tests/test_redshift_user_pass.py → ...files/redshift/test_redshift_user_pass.py b/...redshift/tests/test_redshift_user_pass.py → ...files/redshift/test_redshift_user_pass.py
diff --git a/...owflake/tests/test_snowflake_user_pass.py → ...les/snowflake/test_snowflake_user_pass.py b/...owflake/tests/test_snowflake_user_pass.py → ...les/snowflake/test_snowflake_user_pass.py
diff --git a/...profiles/spark/tests/test_spark_thrift.py → ...profiles/spark/tests/test_spark_thrift.py b/...profiles/spark/tests/test_spark_thrift.py → ...profiles/spark/tests/test_spark_thrift.py
diff --git a/...e/profiles/trino/tests/test_trino_base.py → ...bt/core/profiles/trino/test_trino_base.py b/...e/profiles/trino/tests/test_trino_base.py → ...bt/core/profiles/trino/test_trino_base.py
diff --git a/...les/trino/tests/test_trino_certificate.py → .../profiles/trino/test_trino_certificate.py b/...les/trino/tests/test_trino_certificate.py → .../profiles/trino/test_trino_certificate.py
diff --git a/...re/profiles/trino/tests/test_trino_jwt.py → ...dbt/core/profiles/trino/test_trino_jwt.py b/...re/profiles/trino/tests/test_trino_jwt.py → ...dbt/core/profiles/trino/test_trino_jwt.py
diff --git a/...e/profiles/trino/tests/test_trino_ldap.py → ...bt/core/profiles/trino/test_trino_ldap.py b/...e/profiles/trino/tests/test_trino_ldap.py → ...bt/core/profiles/trino/test_trino_ldap.py
diff --git a/tests/providers/dbt/core/utils/__init__.py b/tests/providers/dbt/core/utils/__init__.py
diff --git a/...utils/tests/test_data_aware_scheduling.py → .../core/utils/test_data_aware_scheduling.py b/...utils/tests/test_data_aware_scheduling.py → .../core/utils/test_data_aware_scheduling.py
diff --git a/...dbt/core/utils/tests/test_warn_parsing.py → ...iders/dbt/core/utils/test_warn_parsing.py b/...dbt/core/utils/tests/test_warn_parsing.py → ...iders/dbt/core/utils/test_warn_parsing.py
diff --git a/tests/providers/dbt/parser/__init__.py b/tests/providers/dbt/parser/__init__.py
diff --git a/...roviders/dbt/parser/tests/test_project.py → tests/providers/dbt/parser/test_project.py b/...roviders/dbt/parser/tests/test_project.py → tests/providers/dbt/parser/test_project.py
diff --git a/tests/providers/dbt/test_dataset.py b/tests/providers/dbt/test_dataset.py
@@ -0,0 +1,16 @@
+"""
+Tests Dataset export override
+"""
+
+import airflow
+
+from cosmos.providers.dbt.dataset import Dataset
+
+
+def test_import() -> None:
+    "Tests that we can import the Dataset object in all versions of Airflow."
+
+    if airflow.__version__ >= "2.4.0":
+        assert Dataset.__module__ == "airflow.datasets"
+    else:
+        assert Dataset.__module__ == "cosmos.providers.dbt.dataset"
diff --git a/cosmos/providers/dbt/tests/test_export.py → tests/providers/dbt/test_export.py b/cosmos/providers/dbt/tests/test_export.py → tests/providers/dbt/test_export.py
diff --git a/cosmos/providers/dbt/tests/test_render.py → tests/providers/dbt/test_render.py b/cosmos/providers/dbt/tests/test_render.py → tests/providers/dbt/test_render.py
diff --git a/cosmos/tests/test-connections.yaml → tests/test-connections.yaml b/cosmos/tests/test-connections.yaml → tests/test-connections.yaml
diff --git a/cosmos/tests/test_example_dags.py → tests/test_example_dags.py b/cosmos/tests/test_example_dags.py → tests/test_example_dags.py
@@ -11,7 +11,7 @@
 
 from . import utils as test_utils
 
-EXAMPLE_DAGS_DIR = Path(__file__).parent.parent.parent / "dev/dags"
+EXAMPLE_DAGS_DIR = Path(__file__).parent.parent / "dev/dags"
 EXAMPLE_CONN_FILE = Path(__file__).parent / "test-connections.yaml"
 AIRFLOW_IGNORE_FILE = EXAMPLE_DAGS_DIR / ".airflowignore"
 

diff --git a/cosmos/tests/test_version.py → tests/test_version.py b/cosmos/tests/test_version.py → tests/test_version.py
diff --git a/cosmos/tests/utils.py → tests/utils.py b/cosmos/tests/utils.py → tests/utils.py