From 1f19621ee691978bf71a8e1131ecad9ee7338bce Mon Sep 17 00:00:00 2001 From: Adam Ling Date: Mon, 14 Oct 2024 09:34:25 -0700 Subject: [PATCH] SNOW-1734196: fix flaky test (#2440) --- tests/integ/scala/test_update_delete_merge_suite.py | 4 +++- tests/integ/test_udf.py | 5 ++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/tests/integ/scala/test_update_delete_merge_suite.py b/tests/integ/scala/test_update_delete_merge_suite.py index 41d195a15d..a01f6a1ac5 100644 --- a/tests/integ/scala/test_update_delete_merge_suite.py +++ b/tests/integ/scala/test_update_delete_merge_suite.py @@ -8,7 +8,7 @@ import pytest -from snowflake.connector.options import installed_pandas, pandas as pd +from snowflake.connector.options import installed_pandas from snowflake.snowpark import ( DeleteResult, MergeResult, @@ -678,6 +678,8 @@ def test_merge_multi_operation(session): ) def test_snow_1694649_repro_merge_with_equal_null(session): # Force temp table + import pandas as pd + df1 = session.create_dataframe(pd.DataFrame({"A": [0, 1], "B": ["a", "b"]})) df2 = session.create_dataframe(pd.DataFrame({"A": [0, 1], "B": ["a", "c"]})) diff --git a/tests/integ/test_udf.py b/tests/integ/test_udf.py index 26660d263b..6dd3d1a980 100644 --- a/tests/integ/test_udf.py +++ b/tests/integ/test_udf.py @@ -1038,7 +1038,10 @@ def only_type_hint(s: str) -> str: only_type_hint_udf = session.udf.register(d["only_type_hint"]) # assert that no warnings are raised here - assert len(caplog.records) == 0 + # SNOW-1734254 for suppressing opentelemetry warning log + assert len(caplog.records) == 0 or [ + all("opentelemetry" in str(record) for record in caplog.records) + ] @pytest.mark.xfail(