summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy/testing/__init__.py
diff options
context:
space:
mode:
authormike bayer <mike_mp@zzzcomputing.com>2020-08-14 00:08:29 +0000
committerGerrit Code Review <gerrit@bbpush.zzzcomputing.com>2020-08-14 00:08:29 +0000
commit9ccf4a2f659d77c7f1aacaa4ff2b3b16889fea5e (patch)
treec30594326d1fb4b70b239c0865f1b7e627e63cc3 /lib/sqlalchemy/testing/__init__.py
parentb1c3c40e54bafe686065827d5b8d92c35bc50648 (diff)
parent5fb0138a3220161703e6ab1087319a669d14e7f4 (diff)
downloadsqlalchemy-9ccf4a2f659d77c7f1aacaa4ff2b3b16889fea5e.tar.gz
Merge "Implement rudimentary asyncio support w/ asyncpg"
Diffstat (limited to 'lib/sqlalchemy/testing/__init__.py')
-rw-r--r--lib/sqlalchemy/testing/__init__.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/sqlalchemy/testing/__init__.py b/lib/sqlalchemy/testing/__init__.py
index 79b7f9eb3..9b1164874 100644
--- a/lib/sqlalchemy/testing/__init__.py
+++ b/lib/sqlalchemy/testing/__init__.py
@@ -12,7 +12,6 @@ from .assertions import assert_raises # noqa
from .assertions import assert_raises_context_ok # noqa
from .assertions import assert_raises_message # noqa
from .assertions import assert_raises_message_context_ok # noqa
-from .assertions import assert_raises_return # noqa
from .assertions import AssertsCompiledSQL # noqa
from .assertions import AssertsExecutionResults # noqa
from .assertions import ComparesTables # noqa
@@ -23,6 +22,8 @@ from .assertions import eq_ignore_whitespace # noqa
from .assertions import eq_regex # noqa
from .assertions import expect_deprecated # noqa
from .assertions import expect_deprecated_20 # noqa
+from .assertions import expect_raises # noqa
+from .assertions import expect_raises_message # noqa
from .assertions import expect_warnings # noqa
from .assertions import in_ # noqa
from .assertions import is_ # noqa
@@ -35,6 +36,7 @@ from .assertions import ne_ # noqa
from .assertions import not_in_ # noqa
from .assertions import startswith_ # noqa
from .assertions import uses_deprecated # noqa
+from .config import async_test # noqa
from .config import combinations # noqa
from .config import db # noqa
from .config import fixture # noqa