summaryrefslogtreecommitdiff
path: root/dev-python/alembic/files/alembic-1.13.1-pytest-8.patch
diff options
context:
space:
mode:
Diffstat (limited to 'dev-python/alembic/files/alembic-1.13.1-pytest-8.patch')
-rw-r--r--dev-python/alembic/files/alembic-1.13.1-pytest-8.patch68
1 files changed, 68 insertions, 0 deletions
diff --git a/dev-python/alembic/files/alembic-1.13.1-pytest-8.patch b/dev-python/alembic/files/alembic-1.13.1-pytest-8.patch
new file mode 100644
index 000000000000..a681645e02ec
--- /dev/null
+++ b/dev-python/alembic/files/alembic-1.13.1-pytest-8.patch
@@ -0,0 +1,68 @@
+From 6bdb9043868d4bd04ebe3fe8a4991735d5f87ed3 Mon Sep 17 00:00:00 2001
+From: Mike Bayer <mike_mp@zzzcomputing.com>
+Date: Sun, 3 Mar 2024 23:11:50 -0500
+Subject: [PATCH] use SQLAlchemy's xdist methods
+
+Fixes to support pytest 8.1 for the test suite.
+
+the use of teardown() was based on pytest's nose
+compat, which is removed. their xdist style tests use the name
+"setup_method()" and "teardown_method()" now.
+
+We have SQLAlchemy's pytestplugin in use which uses pytest fixtures
+to invoke our own xdist style setUp and tearDown methods, which we
+are already using here, so use those for this one test.
+
+Fixes: #1435
+Change-Id: I4c49e81fca6bfa957594714009531fe12691ace5
+---
+ docs/build/unreleased/1435.rst | 5 +++++
+ tests/test_command.py | 15 +++++++--------
+ tox.ini | 2 +-
+ 3 files changed, 13 insertions(+), 9 deletions(-)
+ create mode 100644 docs/build/unreleased/1435.rst
+
+diff --git a/tests/test_command.py b/tests/test_command.py
+index c665f95..04a624a 100644
+--- a/tests/test_command.py
++++ b/tests/test_command.py
+@@ -64,7 +64,7 @@ class HistoryTest(_BufMixin, TestBase):
+ 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 @@ finally:
+
+
+ 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 @@ class CommandLineTest(TestBase):
+ 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
+--
+2.44.0
+