1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
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
|
