mirrors/deluge
1
0
Fork 0
mirror of https://git.deluge-torrent.org/deluge synced 2025-04-05 03:47:57 +03:00
Code Issues Projects Releases Packages Wiki Activity

[Tests] Fix stalling Console tests due to fixture mro order change

Browse source 
The Console UI tests started stalling after the realese of pytest 7.4.3
which was a result of the reversing the mro order of fixtures on
classes, to give base classes priority.

The change resulted in `base_fixture` being sorted before `client` and
`daemon` fixtures and the tests stalled, likely due to the use of yield
in base_fixture.

    # pytest 7.4.2
    [Mark(name='usefixtures', args=('client', 'daemon'), kwargs={})],
    [Mark(name='usefixtures', args=('base_fixture',), kwargs={})],
    # pytest 7.4.3
    [Mark(name='usefixtures', args=('base_fixture',), kwargs={})],
    [Mark(name='usefixtures', args=('client', 'daemon'), kwargs={})],

The fix is to move base_fixture along with the other fixtures and place it
last.

Refs: https://github.com/pytest-dev/pytest/pull/11545
This commit is contained in:
Calum Lind 2025-02-17 22:48:00 +00:00
parent 7c5b7b44a3
commit 0878616b2e
No known key found for this signature in database
GPG key ID: 90597A687B836BA3
2 changed files with 2 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
deluge/tests/test_ui_entry.py
View file

@ -394,8 +394,8 @@ class ConsoleUIWithDaemonBaseTestCase(UIBaseTestCase):
assert std_output.endswith('Configuration value successfully updated.\n') assert std_output.endswith('Configuration value successfully updated.\n')
@pytest.mark.usefixtures('daemon', 'client') @pytest.mark.usefixtures('daemon', 'client', 'base_fixture')
class TestConsoleScriptEntryWithDaemon(BaseTestCase, ConsoleUIWithDaemonBaseTestCase): class TestConsoleScriptEntryWithDaemon(ConsoleUIWithDaemonBaseTestCase):
@pytest.fixture(autouse=True) @pytest.fixture(autouse=True)
def set_var(self, request): def set_var(self, request):
request.cls.var = { request.cls.var = {

1
requirements-ci.txt
View file

@ -1,4 +1,3 @@
-r requirements.txt -r requirements.txt
-r requirements-tests.txt -r requirements-tests.txt
libtorrent==2.0.7 libtorrent==2.0.7
pytest==7.4.2