diff --git a/conftest.py b/conftest.py
index ee7e614..eaf93ad 100644
--- a/conftest.py
+++ b/conftest.py
@@ -25,9 +25,6 @@ import requests.cookies
import pytest
from pytest_mock import MockerFixture
-from xnat4tests import start_xnat, stop_xnat, add_data, Config
-from xnat4tests.utils import set_loggers
-
import xnat
from xnat.session import XNATSession
from xnat.tests.mock import XnatpyRequestsMocker, CreatedObject
@@ -144,57 +141,3 @@ def xnatpy_connection(mocker: MockerFixture,
# Stop patch of threading
mocker.stop(threading_patch)
-
-# Fixtures for xnat4tests, setup a config, use the pytest tmp_path_factory fixture for the tmpdir
-@pytest.fixture(scope="session")
-def xnat4tests_config(tmp_path_factory) -> Config:
- tmp_path = tmp_path_factory.mktemp('config')
-
- docker_host = os.environ.get('DOCKER_HOST')
- if docker_host:
- print(f'Docker host set in environment set to {docker_host}.')
- docker_host = urlparse(docker_host).netloc.split(':')[0]
- else:
- print('No docker host set in environment, using localhost as default.')
- docker_host = 'localhost'
- print(f'Determined docker hostname to be {docker_host}')
-
- set_loggers(loglevel='INFO')
- yield Config(
- xnat_root_dir=tmp_path,
- xnat_port=8080,
- docker_image="xnatpy_xnat4tests",
- docker_container="xnatpy_xnat4tests",
- docker_host=docker_host,
- build_args={
- "xnat_version": "1.8.5",
- "xnat_cs_plugin_version": "3.2.0",
- },
- connection_attempts=15,
- connection_attempt_sleep=10,
- )
-
-
-# Create a context to ensure closure
-@contextlib.contextmanager
-def xnat4tests(config) -> str:
- start_xnat(config_name=config)
- try:
- add_data("dummydicom", config_name=config)
- yield config.xnat_uri
- finally:
- stop_xnat(config_name=config)
-
-
-# Fixtures for xnat4tests, start up a container and get the URI
-@pytest.fixture(scope="session")
-def xnat4tests_uri(xnat4tests_config) -> str:
- with xnat4tests(xnat4tests_config):
- yield xnat4tests_config.xnat_uri
-
-
-# Fixtures for xnat4tests, create an xnatpy connection
-@pytest.fixture(scope="session")
-def xnat4tests_connection(xnat4tests_uri) -> XNATSession:
- with xnat.connect(xnat4tests_uri, user='admin', password='admin') as connection:
- yield connection