Skip to content

Commit ff445a0

Browse files
test: Fix quicksight unit tests (#2748)
1 parent ce85b46 commit ff445a0

File tree

1 file changed

+15
-11
lines changed

1 file changed

+15
-11
lines changed

Diff for: tests/unit/test_quicksight.py

+15-11
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,9 @@
1414

1515

1616
@pytest.mark.xfail(raises=client.exceptions.ConflictException)
17-
def test_quicksight(path, quicksight_datasource, quicksight_dataset, glue_database, glue_table):
17+
def test_quicksight(
18+
path: str, quicksight_datasource: str, quicksight_dataset: str, glue_database: str, glue_table: str
19+
) -> None:
1820
df = get_df_quicksight()
1921
wr.s3.to_parquet(
2022
df=df, path=path, dataset=True, database=glue_database, table=glue_table, partition_cols=["par0", "par1"]
@@ -76,13 +78,14 @@ def test_quicksight(path, quicksight_datasource, quicksight_dataset, glue_databa
7678
wr.quicksight.get_dataset_ids(f"{quicksight_dataset}-sql")
7779
wr.quicksight.get_data_source_ids("test")
7880

79-
wr.quicksight.delete_all_datasets(regex_filter=quicksight_dataset)
81+
wr.quicksight.delete_all_datasets(regex_filter=f"{quicksight_dataset}-.*")
8082
wr.quicksight.delete_all_data_sources(regex_filter=quicksight_datasource)
8183

8284

83-
def test_quicksight_delete_all_datasources_filter():
84-
wr.quicksight.delete_all_data_sources(regex_filter="test.*")
85-
resource_name = f"test-delete-{uuid.uuid4()}"
85+
def test_quicksight_delete_all_datasources_filter() -> None:
86+
resource_name_prefix = f"test-delete-sources-{uuid.uuid4()}"
87+
resource_name = f"{resource_name_prefix}-1"
88+
8689
wr.quicksight.create_athena_data_source(
8790
name=resource_name,
8891
allowed_to_manage={"users": [wr.sts.get_current_identity_name()]},
@@ -92,17 +95,18 @@ def test_quicksight_delete_all_datasources_filter():
9295

9396
assert len(wr.quicksight.get_data_source_ids(resource_name)) == 1
9497

95-
wr.quicksight.delete_all_data_sources(regex_filter="test-delete.*")
98+
wr.quicksight.delete_all_data_sources(regex_filter=f"{resource_name_prefix}-.*")
9699
assert len(wr.quicksight.get_data_source_ids(resource_name)) == 0
97100

98101

99-
def test_quicksight_delete_all_datasets(path, glue_database, glue_table):
102+
def test_quicksight_delete_all_datasets(path: str, glue_database: str, glue_table: str) -> None:
100103
df = get_df_quicksight()
101104
wr.s3.to_parquet(
102105
df=df, path=path, dataset=True, database=glue_database, table=glue_table, partition_cols=["par0", "par1"]
103106
)
104-
wr.quicksight.delete_all_datasets(regex_filter="test.*")
105-
wr.quicksight.delete_all_data_sources(regex_filter="test.*")
107+
108+
resource_name_prefix = f"test-delete-datasets-{uuid.uuid4()}"
109+
resource_name = f"{resource_name_prefix}-1"
106110

107111
resource_name = f"test{str(uuid.uuid4())[:8]}"
108112
wr.quicksight.create_athena_data_source(
@@ -122,7 +126,7 @@ def test_quicksight_delete_all_datasets(path, glue_database, glue_table):
122126
tag_columns={"string": [{"ColumnGeographicRole": "CITY"}, {"ColumnDescription": {"Text": "some description"}}]},
123127
tags={"foo": "boo"},
124128
)
125-
wr.quicksight.delete_all_datasets(regex_filter="test.*")
126-
wr.quicksight.delete_all_data_sources(regex_filter="test.*")
129+
wr.quicksight.delete_all_datasets(regex_filter=f"{resource_name_prefix}-.*")
130+
wr.quicksight.delete_all_data_sources(regex_filter=f"{resource_name_prefix}-.*")
127131

128132
assert len(wr.quicksight.get_dataset_ids(resource_name)) == 0

0 commit comments

Comments
 (0)