From fd12f3f917bac9f5f1b0798f7f50c30e4adc3967 Mon Sep 17 00:00:00 2001
From: Florian Schulze <mail@florian-schulze.net>
Date: Mon, 23 Oct 2023 15:45:41 +0200
Subject: [PATCH] Adjust test setup to upcoming changes in devpi-server.

---
 .../tests/test_constrained.py                 | 37 ++++++++++++-------
 1 file changed, 24 insertions(+), 13 deletions(-)

diff --git a/src/devpi_constrained/tests/test_constrained.py b/src/devpi_constrained/tests/test_constrained.py
index 16dfdc1..fb7ff59 100644
--- a/src/devpi_constrained/tests/test_constrained.py
+++ b/src/devpi_constrained/tests/test_constrained.py
@@ -1,22 +1,33 @@
 from bs4 import BeautifulSoup
+from devpi_common.metadata import parse_version
 from devpi_common.url import URL
-from test_devpi_server.conftest import gentmp  # noqa
-from test_devpi_server.conftest import httpget  # noqa
-from test_devpi_server.conftest import makemapp  # noqa
-from test_devpi_server.conftest import maketestapp  # noqa
-from test_devpi_server.conftest import makexom  # noqa
-from test_devpi_server.conftest import mapp  # noqa
-from test_devpi_server.conftest import pypiurls  # noqa
-from test_devpi_server.conftest import simpypi  # noqa
-from test_devpi_server.conftest import simpypiserver  # noqa
-from test_devpi_server.conftest import storage_info  # noqa
-from test_devpi_server.conftest import testapp  # noqa
+from devpi_server import __version__ as _devpi_server_version
 import pytest
 
-(makexom, mapp, simpypi, testapp)  # shut up pyflakes
 
+devpi_server_version = parse_version(_devpi_server_version)
 
-pytestmark = [pytest.mark.nomocking]
+
+if devpi_server_version < parse_version("6.9.3dev"):
+    from test_devpi_server.conftest import gentmp  # noqa: F401
+    from test_devpi_server.conftest import httpget  # noqa: F401
+    from test_devpi_server.conftest import makemapp  # noqa: F401
+    from test_devpi_server.conftest import maketestapp  # noqa: F401
+    from test_devpi_server.conftest import makexom
+    from test_devpi_server.conftest import mapp
+    from test_devpi_server.conftest import pypiurls  # noqa: F401
+    from test_devpi_server.conftest import simpypi
+    from test_devpi_server.conftest import simpypiserver  # noqa: F401
+    from test_devpi_server.conftest import storage_info  # noqa: F401
+    from test_devpi_server.conftest import testapp
+    (makexom, mapp, simpypi, testapp)  # shut up pyflakes
+else:
+    pytest_plugins = ["pytest_devpi_server", "test_devpi_server.plugin"]
+
+
+pytestmark = [
+    pytest.mark.nomocking,
+    pytest.mark.notransaction]
 
 
 @pytest.fixture