Skip to content

Commit

Permalink
adding clean_up methods to basic and unique_id tests (#9195)
Browse files Browse the repository at this point in the history
* init attempt of adding clean_up methods to basic and unique_id tests

* swapping cleanup method drop of test_schema to unique_schema to test breakage on docs_generate test

* moving the clean_up method down into class BaseDocsGenerate

* remove drop relation for unique_schema

* manually define alternate_schema for clean_up as not being seen as part of project_config

* add changelog

* remove unneeded changelog

* uncomment line that generates new manifest and delete manifest our changes created

* make sure the manifest test is deleted and readd older version of manifest.json to appease test

* manually revert file to previous commit

* Revert "manually revert file to previous commit"

This reverts commit a755419.
  • Loading branch information
McKnight-42 authored Dec 12, 2023
1 parent 6e0a387 commit c2bc2f0
Show file tree
Hide file tree
Showing 12 changed files with 113 additions and 2 deletions.
11 changes: 11 additions & 0 deletions tests/adapter/dbt/tests/adapter/basic/test_adapter_methods.py
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,17 @@ def project_config_update(self):
"name": "adapter_methods",
}

@pytest.fixture(autouse=True)
def clean_up(self, project):
yield
with project.adapter.connection_named("__test"):
relation = project.adapter.Relation.create(
database=project.database, schema=project.test_schema
)
project.adapter.drop_schema(relation)

pass

# snowflake need all tables in CAP name
@pytest.fixture(scope="class")
def equal_tables(self):
Expand Down
11 changes: 11 additions & 0 deletions tests/adapter/dbt/tests/adapter/basic/test_base.py
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,17 @@ def project_config_update(self):
"name": "base",
}

@pytest.fixture(autouse=True)
def clean_up(self, project):
yield
with project.adapter.connection_named("__test"):
relation = project.adapter.Relation.create(
database=project.database, schema=project.test_schema
)
project.adapter.drop_schema(relation)

pass

def test_base(self, project):

# seed command
Expand Down
12 changes: 12 additions & 0 deletions tests/adapter/dbt/tests/adapter/basic/test_docs_generate.py
Original file line number Diff line number Diff line change
Expand Up @@ -428,6 +428,18 @@ def expected_catalog(self, project, profile_user):
model_stats=no_stats(),
)

@pytest.fixture(autouse=True)
def clean_up(self, project):
yield
with project.adapter.connection_named("__test"):
alternate_schema = f"{project.test_schema}_test"
relation = project.adapter.Relation.create(
database=project.database, schema=alternate_schema
)
project.adapter.drop_schema(relation)

pass

# Test "--no-compile" flag works and produces no manifest.json
def test_run_and_generate_no_compile(self, project, expected_catalog):
start_time = run_and_generate(project, ["--no-compile"])
Expand Down
11 changes: 11 additions & 0 deletions tests/adapter/dbt/tests/adapter/basic/test_generic_tests.py
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,17 @@ def models(self):
"schema_table.yml": generic_test_table_yml,
}

@pytest.fixture(autouse=True)
def clean_up(self, project):
yield
with project.adapter.connection_named("__test"):
relation = project.adapter.Relation.create(
database=project.database, schema=project.test_schema
)
project.adapter.drop_schema(relation)

pass

def test_generic_tests(self, project):
# seed command
results = run_dbt(["seed"])
Expand Down
11 changes: 11 additions & 0 deletions tests/adapter/dbt/tests/adapter/basic/test_incremental.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,17 @@ def models(self):
def seeds(self):
return {"base.csv": seeds_base_csv, "added.csv": seeds_added_csv}

@pytest.fixture(autouse=True)
def clean_up(self, project):
yield
with project.adapter.connection_named("__test"):
relation = project.adapter.Relation.create(
database=project.database, schema=project.test_schema
)
project.adapter.drop_schema(relation)

pass

def test_incremental(self, project):
# seed command
results = run_dbt(["seed"])
Expand Down
11 changes: 11 additions & 0 deletions tests/adapter/dbt/tests/adapter/basic/test_singular_tests.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,17 @@ def tests(self):
def project_config_update(self):
return {"name": "singular_tests"}

@pytest.fixture(autouse=True)
def clean_up(self, project):
yield
with project.adapter.connection_named("__test"):
relation = project.adapter.Relation.create(
database=project.database, schema=project.test_schema
)
project.adapter.drop_schema(relation)

pass

def test_singular_tests(self, project):
# test command
results = run_dbt(["test"], expect_pass=False)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,17 @@ def project_config_update(self):
"name": "singular_tests_ephemeral",
}

@pytest.fixture(autouse=True)
def clean_up(self, project):
yield
with project.adapter.connection_named("__test"):
relation = project.adapter.Relation.create(
database=project.database, schema=project.test_schema
)
project.adapter.drop_schema(relation)

pass

def test_singular_tests_ephemeral(self, project):
# check results from seed command
results = run_dbt(["seed"])
Expand Down
11 changes: 11 additions & 0 deletions tests/adapter/dbt/tests/adapter/basic/test_snapshot_check_cols.py
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,17 @@ def snapshots(self):
"cc_name_snapshot.sql": cc_name_snapshot_sql,
}

@pytest.fixture(autouse=True)
def clean_up(self, project):
yield
with project.adapter.connection_named("__test"):
relation = project.adapter.Relation.create(
database=project.database, schema=project.test_schema
)
project.adapter.drop_schema(relation)

pass

def test_snapshot_check_cols(self, project):
# seed command
results = run_dbt(["seed"])
Expand Down
11 changes: 11 additions & 0 deletions tests/adapter/dbt/tests/adapter/basic/test_snapshot_timestamp.py
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,17 @@ def snapshots(self):
def project_config_update(self):
return {"name": "snapshot_strategy_timestamp"}

@pytest.fixture(autouse=True)
def clean_up(self, project):
yield
with project.adapter.connection_named("__test"):
relation = project.adapter.Relation.create(
database=project.database, schema=project.test_schema
)
project.adapter.drop_schema(relation)

pass

def test_snapshot_timestamp(self, project):
# seed command
results = run_dbt(["seed"])
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -344,6 +344,17 @@ def seeds(self):
"add_new_rows.sql": seeds__add_new_rows_sql,
}

@pytest.fixture(autouse=True)
def clean_up(self, project):
yield
with project.adapter.connection_named("__test"):
relation = project.adapter.Relation.create(
database=project.database, schema=project.test_schema
)
project.adapter.drop_schema(relation)

pass

def update_incremental_model(self, incremental_model):
"""update incremental model after the seed table has been updated"""
model_result_set = run_dbt(["run", "--select", incremental_model])
Expand Down
2 changes: 1 addition & 1 deletion tests/functional/artifacts/data/state/v12/manifest.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion tests/functional/artifacts/test_previous_version_state.py
Original file line number Diff line number Diff line change
Expand Up @@ -412,7 +412,7 @@ def test_compare_state_current(self, project):
current_manifest_schema_version == self.CURRENT_EXPECTED_MANIFEST_VERSION
), "Sounds like you've bumped the manifest version and need to update this test!"
# If we need a newly generated manifest, uncomment the following line and commit the result
self.generate_latest_manifest(project, current_manifest_schema_version)
# self.generate_latest_manifest(project, current_manifest_schema_version)
self.compare_previous_state(project, current_manifest_schema_version, True, 0)

def test_backwards_compatible_versions(self, project):
Expand Down

0 comments on commit c2bc2f0

Please sign in to comment.