Minor tests adjustments

Author: jaidisido

tests/test_athena.py

@@ -124,8 +124,7 @@ def test_athena_ctas(path, path2, path3, glue_table, glue_table2, glue_database,
 
 
 def test_athena(path, glue_database, glue_table, kms_key, workgroup0, workgroup1):
-    table = f"__{glue_table}"
-    wr.catalog.delete_table_if_exists(database=glue_database, table=table)
+    wr.catalog.delete_table_if_exists(database=glue_database, table=glue_table)
     wr.s3.to_parquet(
         df=get_df(),
         path=path,
@@ -134,11 +133,11 @@ def test_athena(path, glue_database, glue_table, kms_key, workgroup0, workgroup1
         dataset=True,
         mode="overwrite",
         database=glue_database,
-        table=table,
+        table=glue_table,
         partition_cols=["par0", "par1"],
     )
     dfs = wr.athena.read_sql_query(
-        sql=f"SELECT * FROM {table}",
+        sql=f"SELECT * FROM {glue_table}",
         database=glue_database,
         ctas_approach=False,
         chunksize=1,
@@ -151,7 +150,7 @@ def test_athena(path, glue_database, glue_table, kms_key, workgroup0, workgroup1
         ensure_data_types(df=df2)
         ensure_athena_query_metadata(df=df2, ctas_approach=False, encrypted=False)
     df = wr.athena.read_sql_query(
-        sql=f"SELECT * FROM {table}",
+        sql=f"SELECT * FROM {glue_table}",
         database=glue_database,
         ctas_approach=False,
         workgroup=workgroup1,
@@ -160,14 +159,14 @@ def test_athena(path, glue_database, glue_table, kms_key, workgroup0, workgroup1
     assert len(df.index) == 3
     ensure_data_types(df=df)
     ensure_athena_query_metadata(df=df, ctas_approach=False, encrypted=False)
-    wr.athena.repair_table(table=table, database=glue_database)
-    assert len(wr.athena.describe_table(database=glue_database, table=table).index) > 0
+    wr.athena.repair_table(table=glue_table, database=glue_database)
+    assert len(wr.athena.describe_table(database=glue_database, table=glue_table).index) > 0
     assert (
-        wr.catalog.table(database=glue_database, table=table).to_dict()
-        == wr.athena.describe_table(database=glue_database, table=table).to_dict()
+        wr.catalog.table(database=glue_database, table=glue_table).to_dict()
+        == wr.athena.describe_table(database=glue_database, table=glue_table).to_dict()
     )
     df = wr.athena.read_sql_query(
-        sql=f"SELECT * FROM {table} WHERE iint8 = :iint8_value;",
+        sql=f"SELECT * FROM {glue_table} WHERE iint8 = :iint8_value;",
         database=glue_database,
         ctas_approach=False,
         workgroup=workgroup1,
@@ -176,9 +175,9 @@ def test_athena(path, glue_database, glue_table, kms_key, workgroup0, workgroup1
     )
     assert len(df.index) == 1
     ensure_athena_query_metadata(df=df, ctas_approach=False, encrypted=False)
-    query = wr.athena.show_create_table(database=glue_database, table=table)
+    query = wr.athena.show_create_table(database=glue_database, table=glue_table)
     assert (
-        query.split("LOCATION")[0] == f"CREATE EXTERNAL TABLE `{table}`"
+        query.split("LOCATION")[0] == f"CREATE EXTERNAL TABLE `{glue_table}`"
         f"( `iint8` tinyint,"
         f" `iint16` smallint,"
         f" `iint32` int,"
@@ -199,7 +198,6 @@ def test_athena(path, glue_database, glue_table, kms_key, workgroup0, workgroup1
         f"STORED AS INPUTFORMAT 'org.apache.hadoop.hive.ql.io.parquet.MapredParquetInputFormat' "
         f"OUTPUTFORMAT 'org.apache.hadoop.hive.ql.io.parquet.MapredParquetOutputFormat' "
     )
-    wr.catalog.delete_table_if_exists(database=glue_database, table=table)
 
 
 def test_catalog(path: str, glue_database: str, glue_table: str) -> None:

tests/test_redshift.py

@@ -281,6 +281,7 @@ def test_spectrum(path, redshift_table, redshift_con, glue_database, redshift_ex
         assert len(rows) == len(df.index)
         for row in rows:
             assert len(row) == len(df.columns)
+    wr.catalog.delete_table_if_exists(database=glue_database, table=redshift_table)
 
 
 def test_category(path, redshift_table, redshift_con, databases_parameters):