diff --git a/tests/integ/scala/test_dataframe_join_suite.py b/tests/integ/scala/test_dataframe_join_suite.py index a954424fc2..7519adb137 100644 --- a/tests/integ/scala/test_dataframe_join_suite.py +++ b/tests/integ/scala/test_dataframe_join_suite.py @@ -1010,12 +1010,11 @@ def test_negative_test_join_of_join(session): df_j = df_l.join(df_r, df_l["c1"] == df_r["c1"]) df_j_clone = copy.copy(df_j) - if session._join_alias_fix: + # TODO SNOW-2060042: Determine whether df_l["c1"] and df_r["c1"] should be treated as ambiguous, + # or if there's enough context to resolve them unambiguously. + with pytest.raises(SnowparkSQLAmbiguousJoinException) as ex_info: df_j.join(df_j_clone, df_l["c1"] == df_r["c1"]).collect() - else: - with pytest.raises(SnowparkSQLAmbiguousJoinException) as ex_info: - df_j.join(df_j_clone, df_l["c1"] == df_r["c1"]).collect() - assert "reference to the column 'C1' is ambiguous" in ex_info.value.message + assert "reference to the column 'C1' is ambiguous" in ex_info.value.message finally: session.table(table_name1).drop_table() diff --git a/tests/integ/test_cte.py b/tests/integ/test_cte.py index ab73285a3d..bb0e2ee59a 100644 --- a/tests/integ/test_cte.py +++ b/tests/integ/test_cte.py @@ -1132,7 +1132,6 @@ def test_time_series_aggregation_grouping(session): union_count=0, join_count=0, cte_join_count=0, - describe_count_for_optimized=6 if session._join_alias_fix else None, )