diff --git a/docs/build/unreleased/1435.rst b/docs/build/unreleased/1435.rst new file mode 100644 index 00000000..8f9e4cd0 --- /dev/null +++ b/docs/build/unreleased/1435.rst @@ -0,0 +1,5 @@ +.. change:: + :tags: bug, tests + :tickets: 1435 + + Fixes to support pytest 8.1 for the test suite. diff --git a/tests/test_command.py b/tests/test_command.py index c665f955..04a624ad 100644 --- a/tests/test_command.py +++ b/tests/test_command.py @@ -64,7 +64,7 @@ def setup_class(cls): def teardown_class(cls): clear_staging_env() - def teardown(self): + def tearDown(self): self.cfg.set_main_option("revision_environment", "false") @classmethod @@ -206,13 +206,12 @@ def test_history_indicate_current(self): class RevisionEnvironmentTest(_BufMixin, TestBase): - @classmethod - def setup(cls): - cls.env = staging_env() - cls.cfg = _sqlite_testing_config() - cls._setup_env_file() + def setUp(self): + self.env = staging_env() + self.cfg = _sqlite_testing_config() + self._setup_env_file() - def teardown(self): + def tearDown(self): self.cfg.set_main_option("revision_environment", "false") clear_staging_env() @@ -1144,7 +1143,7 @@ def setup_class(cls): cls.cfg = _sqlite_testing_config() cls.a, cls.b, cls.c = three_rev_fixture(cls.cfg) - def teardown(self): + def tearDown(self): os.environ.pop("ALEMBIC_CONFIG", None) @classmethod diff --git a/tox.ini b/tox.ini index 3b4c1ff7..4b0f082b 100644 --- a/tox.ini +++ b/tox.ini @@ -8,7 +8,7 @@ SQLA_REPO = {env:SQLA_REPO:git+https://github.com/sqlalchemy/sqlalchemy.git} [testenv] cov_args=--cov=alembic --cov-report term --cov-report xml -deps=pytest>4.6 +deps=pytest>4.6,<8.2 pytest-xdist sqla13: pytest<7 sqla13: {[tox]SQLA_REPO}@rel_1_3#egg=sqlalchemy