SNOW-1296812: fix merge gate tests (#1913)

Author: sfc-gh-aalam

test/integ/test_cursor.py

@@ -1265,6 +1265,7 @@ def test_execute_helper_params_error(conn_testaccount):
             cur._execute_helper("select %()s", statement_params="1")
 
 
+@pytest.mark.skipolddriver
 def test_desc_rewrite(conn, caplog):
     """Tests whether describe queries are rewritten as expected and this action is logged."""
     with conn() as cnx:

test/integ/test_structured_types.py

@@ -40,6 +40,9 @@ def test_structured_array_types(conn_cnx):
             assert metadata.type_code == 10
 
 
+@pytest.mark.xfail(
+    reason="SNOW-1305289: Param difference in aws environment", strict=False
+)
 def test_structured_map_types(conn_cnx):
     with conn_cnx() as cnx:
         cur = cnx.cursor()