Skip to content

Commit fd12f3f

Browse files
committed
Adjust test setup to upcoming changes in devpi-server.
1 parent f695b81 commit fd12f3f

File tree

1 file changed

+24
-13
lines changed

1 file changed

+24
-13
lines changed

src/devpi_constrained/tests/test_constrained.py

Lines changed: 24 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,33 @@
11
from bs4 import BeautifulSoup
2+
from devpi_common.metadata import parse_version
23
from devpi_common.url import URL
3-
from test_devpi_server.conftest import gentmp # noqa
4-
from test_devpi_server.conftest import httpget # noqa
5-
from test_devpi_server.conftest import makemapp # noqa
6-
from test_devpi_server.conftest import maketestapp # noqa
7-
from test_devpi_server.conftest import makexom # noqa
8-
from test_devpi_server.conftest import mapp # noqa
9-
from test_devpi_server.conftest import pypiurls # noqa
10-
from test_devpi_server.conftest import simpypi # noqa
11-
from test_devpi_server.conftest import simpypiserver # noqa
12-
from test_devpi_server.conftest import storage_info # noqa
13-
from test_devpi_server.conftest import testapp # noqa
4+
from devpi_server import __version__ as _devpi_server_version
145
import pytest
156

16-
(makexom, mapp, simpypi, testapp) # shut up pyflakes
177

8+
devpi_server_version = parse_version(_devpi_server_version)
189

19-
pytestmark = [pytest.mark.nomocking]
10+
11+
if devpi_server_version < parse_version("6.9.3dev"):
12+
from test_devpi_server.conftest import gentmp # noqa: F401
13+
from test_devpi_server.conftest import httpget # noqa: F401
14+
from test_devpi_server.conftest import makemapp # noqa: F401
15+
from test_devpi_server.conftest import maketestapp # noqa: F401
16+
from test_devpi_server.conftest import makexom
17+
from test_devpi_server.conftest import mapp
18+
from test_devpi_server.conftest import pypiurls # noqa: F401
19+
from test_devpi_server.conftest import simpypi
20+
from test_devpi_server.conftest import simpypiserver # noqa: F401
21+
from test_devpi_server.conftest import storage_info # noqa: F401
22+
from test_devpi_server.conftest import testapp
23+
(makexom, mapp, simpypi, testapp) # shut up pyflakes
24+
else:
25+
pytest_plugins = ["pytest_devpi_server", "test_devpi_server.plugin"]
26+
27+
28+
pytestmark = [
29+
pytest.mark.nomocking,
30+
pytest.mark.notransaction]
2031

2132

2233
@pytest.fixture

0 commit comments

Comments
 (0)