diff options
Diffstat (limited to 'test')
| -rw-r--r-- | test/engine/test_ddlevents.py | 6 | ||||
| -rw-r--r-- | test/engine/test_pool.py | 10 | ||||
| -rw-r--r-- | test/engine/test_transaction.py | 4 | ||||
| -rw-r--r-- | test/orm/test_collection.py | 5 |
4 files changed, 16 insertions, 9 deletions
diff --git a/test/engine/test_ddlevents.py b/test/engine/test_ddlevents.py index 562ed4d68..2762eaa7e 100644 --- a/test/engine/test_ddlevents.py +++ b/test/engine/test_ddlevents.py @@ -444,7 +444,7 @@ class DDLExecutionTest(fixtures.TestBase): assert "xyzzy" in strings assert "fnord" in strings - @testing.uses_deprecated(r"See DDLEvents") + @testing.uses_deprecated(r".*use the DDLEvents") def test_table_by_metadata_deprecated(self): metadata, users, engine = self.metadata, self.users, self.engine DDL("mxyzptlk").execute_at("before-create", users) @@ -548,7 +548,7 @@ class DDLExecutionTest(fixtures.TestBase): assert "xyzzy" in strings assert "fnord" in strings - @testing.uses_deprecated(r"See DDLEvents") + @testing.uses_deprecated(r".*use the DDLEvents") def test_metadata_deprecated(self): metadata, engine = self.metadata, self.engine @@ -607,7 +607,7 @@ class DDLExecutionTest(fixtures.TestBase): strings = " ".join(str(x) for x in pg_mock.mock) assert "my_test_constraint" in strings - @testing.uses_deprecated(r"See DDLEvents") + @testing.uses_deprecated(r".*use the DDLEvents") def test_conditional_constraint_deprecated(self): metadata, users, engine = self.metadata, self.users, self.engine nonpg_mock = engines.mock_engine(dialect_name="sqlite") diff --git a/test/engine/test_pool.py b/test/engine/test_pool.py index 02eb5fc54..75caa233a 100644 --- a/test/engine/test_pool.py +++ b/test/engine/test_pool.py @@ -824,7 +824,10 @@ class PoolFirstConnectSyncTest(PoolTestBase): class DeprecatedPoolListenerTest(PoolTestBase): @testing.requires.predictable_gc - @testing.uses_deprecated(r".*Use event.listen") + @testing.uses_deprecated( + r".*Use the PoolEvents", + r".*'listeners' argument .* is deprecated" + ) def test_listeners(self): class InstrumentingListener(object): def __init__(self): @@ -1009,7 +1012,10 @@ class DeprecatedPoolListenerTest(PoolTestBase): c.close() snoop.assert_total(1, 1, 2, 2) - @testing.uses_deprecated(r".*Use event.listen") + @testing.uses_deprecated( + r".*Use the PoolEvents", + r".*'listeners' argument .* is deprecated" + ) def test_listeners_callables(self): def connect(dbapi_con, con_record): counts[0] += 1 diff --git a/test/engine/test_transaction.py b/test/engine/test_transaction.py index 136468329..d8161a29a 100644 --- a/test/engine/test_transaction.py +++ b/test/engine/test_transaction.py @@ -823,8 +823,8 @@ class ExplicitAutoCommitTest(fixtures.TestBase): conn2.close() @testing.uses_deprecated( - r"autocommit on select\(\) is deprecated", - r"``autocommit\(\)`` is deprecated", + r".*select.autocommit parameter is deprecated", + r".*SelectBase.autocommit\(\) .* is deprecated", ) def test_explicit_compiled_deprecated(self): conn1 = testing.db.connect() diff --git a/test/orm/test_collection.py b/test/orm/test_collection.py index 3ff0129c0..4e40ac346 100644 --- a/test/orm/test_collection.py +++ b/test/orm/test_collection.py @@ -1228,7 +1228,7 @@ class CollectionsTest(fixtures.ORMTest): self._test_dict_bulk(MyOrdered) self.assert_(getattr(MyOrdered, "_sa_instrumented") == id(MyOrdered)) - @testing.uses_deprecated(r".*Use the bulk_replace event handler") + @testing.uses_deprecated(r".*Please refer to the .*bulk_replace listener") def test_dict_subclass4(self): # tests #2654 class MyDict(collections.MappedCollection): @@ -2420,7 +2420,7 @@ class InstrumentationTest(fixtures.ORMTest): collections._instrument_class(Touchy) - @testing.uses_deprecated(r".*Use the bulk_replace event handler") + @testing.uses_deprecated(r".*Please refer to the .*bulk_replace listener") def test_name_setup(self): class Base(object): @collection.iterator @@ -2464,6 +2464,7 @@ class InstrumentationTest(fixtures.ORMTest): eq_(Sub._sa_iterator(Sub(), 5), "base_iterate") eq_(Sub._sa_converter(Sub(), 5), "sub_convert") + @testing.uses_deprecated(r".*Please refer to the .*init_collection") def test_link_event(self): canary = [] |