Merge "fix test suite warnings" into main

2 files changed, 6 insertions, 5 deletions

diff --git a/test/sql/test_delete.py b/test/sql/test_delete.py
index 5b7e5ebbe..9f9e104b6 100644
--- a/test/sql/test_delete.py
+++ b/test/sql/test_delete.py
@@ -76,11 +76,15 @@ class DeleteTest(_DeleteTestBase, fixtures.TablesTest, AssertsCompiledSQL):
     def test_where_empty(self):
         table1 = self.tables.mytable
 
-        with expect_deprecated():
+        with expect_deprecated(
+            r"Invoking and_\(\) without arguments is deprecated"
+        ):
             self.assert_compile(
                 table1.delete().where(and_()), "DELETE FROM mytable"
             )
-        with expect_deprecated():
+        with expect_deprecated(
+            r"Invoking or_\(\) without arguments is deprecated"
+        ):
             self.assert_compile(
                 table1.delete().where(or_()), "DELETE FROM mytable"
             )
diff --git a/test/sql/test_insert_exec.py b/test/sql/test_insert_exec.py
index f545671e7..0fee9bd35 100644
--- a/test/sql/test_insert_exec.py
+++ b/test/sql/test_insert_exec.py
@@ -1239,7 +1239,6 @@ class IMVSentinelTest(fixtures.TestBase):
             ):
                 return expect_warnings(
                     "Batches were downgraded",
-                    raise_on_any_unexpected=True,
                 )
 
         return contextlib.nullcontext()
@@ -1982,7 +1981,6 @@ class IMVSentinelTest(fixtures.TestBase):
         ):
             with expect_warnings(
                 "Batches were downgraded for sorted INSERT",
-                raise_on_any_unexpected=True,
             ):
                 result = connection.execute(stmt, data)
         else:
@@ -2407,7 +2405,6 @@ class IMVSentinelTest(fixtures.TestBase):
 
         with expect_warnings(
             r".*but has no Python-side or server-side default ",
-            raise_on_any_unexpected=True,
         ):
             with expect_raises(exc.IntegrityError):
                 connection.execute(