Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Prepare for prerelease verification #777

Merged
merged 11 commits into from
Aug 21, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion dbt/adapters/databricks/connections.py
Original file line number Diff line number Diff line change
Expand Up @@ -818,7 +818,6 @@ def set_connection_name(
'connection_named', called by 'connection_for(node)'.
Creates a connection for this thread if one doesn't already
exist, and will rename an existing connection."""

self._cleanup_idle_connections()

conn_name: str = "master" if name is None else name
Expand Down
4 changes: 4 additions & 0 deletions pytest.ini
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,7 @@ testpaths =
tests/unit
tests/integration
tests/functional
markers =
external: mark test as requiring an external location
python: mark test as running a python model
dlt: mark test as running a DLT model

This file was deleted.

2 changes: 2 additions & 0 deletions tests/functional/adapter/basic/test_incremental.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ class TestIncrementalDeltaNotSchemaChange(BaseIncrementalNotSchemaChange):
pass


@pytest.mark.external
@pytest.mark.skip_profile("databricks_uc_cluster", "databricks_cluster")
class TestIncrementalParquet(BaseIncremental):
@pytest.fixture(scope="class")
Expand All @@ -50,6 +51,7 @@ def project_config_update(self):
}


@pytest.mark.external
@pytest.mark.skip_profile("databricks_uc_cluster", "databricks_cluster")
class TestIncrementalCSV(BaseIncremental):
@pytest.fixture(scope="class")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ def test_changing_cluster_by(self, project):
assert False


@pytest.mark.python
@pytest.mark.skip_profile("databricks_cluster")
class TestIncrementalPythonLiquidClustering:
@pytest.fixture(scope="class")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ class TestAppendDelta(AppendBase):
pass


@pytest.mark.external
@pytest.mark.skip_profile("databricks_uc_cluster", "databricks_cluster")
class TestAppendParquet(AppendBase):
@pytest.fixture(scope="class")
Expand Down Expand Up @@ -118,6 +119,7 @@ def test_incremental(self, project):
util.check_relations_equal(project.adapter, ["overwrite_model", "upsert_expected"])


@pytest.mark.external
@pytest.mark.skip("This test is not repeatable due to external location")
class TestInsertOverwriteParquet(InsertOverwriteBase):
@pytest.fixture(scope="class")
Expand All @@ -132,6 +134,7 @@ def project_config_update(self):
}


@pytest.mark.external
@pytest.mark.skip("This test is not repeatable due to external location")
class TestInsertOverwriteWithPartitionsParquet(InsertOverwriteBase):
@pytest.fixture(scope="class")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ def test_changing_tags(self, project):
assert results_dict == {"c": "e", "d": "f"}


@pytest.mark.python
@pytest.mark.skip_profile("databricks_cluster")
class TestIncrementalPythonTags:
@pytest.fixture(scope="class")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ def test_changing_tblproperties(self, project):
assert results_dict["d"] == "f"


@pytest.mark.python
@pytest.mark.skip_profile("databricks_cluster")
class TestIncrementalPythonTblproperties:
@pytest.fixture(scope="class")
Expand Down
46 changes: 0 additions & 46 deletions tests/functional/adapter/long_sessions/fixtures.py

This file was deleted.

101 changes: 0 additions & 101 deletions tests/functional/adapter/long_sessions/test_long_sessions.py

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ def query_relation_type(project, relation: BaseRelation) -> Optional[str]:
return fixtures.query_relation_type(project, relation)


@pytest.mark.dlt
@pytest.mark.skip_profile("databricks_cluster", "databricks_uc_cluster")
class TestMaterializedViews(TestMaterializedViewsMixin, MaterializedViewBasic):
def test_table_replaces_materialized_view(self, project, my_materialized_view):
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -80,20 +80,23 @@ def query_relation_type(project, relation: BaseRelation) -> Optional[str]:
return fixtures.query_relation_type(project, relation)


@pytest.mark.dlt
@pytest.mark.skip_profile("databricks_cluster", "databricks_uc_cluster")
class TestMaterializedViewApplyChanges(
MaterializedViewChangesMixin, MaterializedViewChangesApplyMixin
):
pass


@pytest.mark.dlt
@pytest.mark.skip_profile("databricks_cluster", "databricks_uc_cluster")
class TestMaterializedViewContinueOnChanges(
MaterializedViewChangesMixin, MaterializedViewChangesContinueMixin
):
pass


@pytest.mark.dlt
@pytest.mark.skip_profile("databricks_cluster", "databricks_uc_cluster")
class TestMaterializedViewFailOnChanges(
MaterializedViewChangesMixin, MaterializedViewChangesFailMixin
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -245,6 +245,7 @@ def test_quoted_column_comments(self, adapter, table_relation):
break


@pytest.mark.external
# Skipping UC Cluster to ensure these tests don't fail due to overlapping resources
@pytest.mark.skip_profile("databricks_uc_cluster")
class TestPersistDocsWithSeeds:
Expand Down
7 changes: 7 additions & 0 deletions tests/functional/adapter/python_model/test_python_model.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,16 +9,19 @@
from tests.functional.adapter.python_model import fixtures as override_fixtures


@pytest.mark.python
@pytest.mark.skip_profile("databricks_uc_sql_endpoint")
class TestPythonModel(BasePythonModelTests):
pass


@pytest.mark.python
@pytest.mark.skip_profile("databricks_uc_sql_endpoint")
class TestPythonIncrementalModel(BasePythonIncrementalTests):
pass


@pytest.mark.python
@pytest.mark.skip_profile("databricks_uc_sql_endpoint")
class TestChangingSchema:
@pytest.fixture(scope="class")
Expand All @@ -42,6 +45,7 @@ def test_changing_schema_with_log_validation(self, project, logs_dir):
assert "Execution status: OK in" in log


@pytest.mark.python
@pytest.mark.skip_profile("databricks_uc_sql_endpoint")
class TestChangingSchemaIncremental:
@pytest.fixture(scope="class")
Expand All @@ -60,6 +64,7 @@ def test_changing_schema_via_incremental(self, project):
util.check_relations_equal(project.adapter, ["incremental_model", "expected_incremental"])


@pytest.mark.python
@pytest.mark.skip_profile("databricks_cluster", "databricks_uc_cluster")
class TestSpecifyingHttpPath(BasePythonModelTests):
@pytest.fixture(scope="class")
Expand All @@ -73,6 +78,8 @@ def models(self):
}


@pytest.mark.python
@pytest.mark.external
@pytest.mark.skip_profile("databricks_cluster", "databricks_uc_sql_endpoint")
class TestComplexConfig:
@pytest.fixture(scope="class")
Expand Down
1 change: 1 addition & 0 deletions tests/functional/adapter/python_model/test_spark.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
)


@pytest.mark.python
@pytest.mark.skip_profile("databricks_uc_sql_endpoint")
class TestPySpark(BasePySparkTests):
@pytest.fixture(scope="class")
Expand Down
1 change: 1 addition & 0 deletions tests/functional/adapter/simple_copy/test_simple_copy.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@


# Tests with materialized_views, which only works for SQL Warehouse
@pytest.mark.dlt
@pytest.mark.skip_profile("databricks_cluster", "databricks_uc_cluster")
class TestSimpleCopyBase(SimpleCopyBase):
pass
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
from tests.functional.adapter.streaming_tables import fixtures


@pytest.mark.dlt
@pytest.mark.skip_profile("databricks_cluster", "databricks_uc_cluster")
class TestStreamingTablesBasic:
@staticmethod
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,7 @@ def test_full_refresh_occurs_with_changes(self, project, my_streaming_table):
util.assert_message_in_logs(f"Applying REPLACE to: {my_streaming_table}", logs)


@pytest.mark.dlt
@pytest.mark.skip_profile("databricks_cluster", "databricks_uc_cluster")
class TestStreamingTableChangesApply(StreamingTableChanges):
@pytest.fixture(scope="class")
Expand Down Expand Up @@ -153,6 +154,7 @@ def test_change_is_applied_via_replace(self, project, my_streaming_table):
util.assert_message_in_logs(f"Applying REPLACE to: {my_streaming_table}", logs)


@pytest.mark.dlt
@pytest.mark.skip_profile("databricks_cluster", "databricks_uc_cluster")
class TestStreamingTableChangesContinue(StreamingTableChanges):
@pytest.fixture(scope="class")
Expand Down Expand Up @@ -193,6 +195,7 @@ def test_change_is_not_applied_via_replace(self, project, my_streaming_table):
util.assert_message_in_logs(f"Applying REPLACE to: {my_streaming_table}", logs, False)


@pytest.mark.dlt
@pytest.mark.skip_profile("databricks_cluster", "databricks_uc_cluster")
class TestStreamingTableChangesFail(StreamingTableChanges):
@pytest.fixture(scope="class")
Expand Down
1 change: 1 addition & 0 deletions tests/functional/adapter/tags/test_databricks_tags.py
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ def models(self):
return {"tags.sql": fixtures.tags_sql.replace("table", "incremental")}


@pytest.mark.python
@pytest.mark.skip_profile("databricks_cluster")
class TestPythonTags(TestTags):
@pytest.fixture(scope="class")
Expand Down
Loading
Loading