From df6e94b20efb240c2d4bc78de6db404832b2b4d4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Fri, 28 Jul 2023 12:10:07 +0200
Subject: [PATCH] move environment to helpers module

This fixes registering pytest plugins
---
 pkgs/clan-cli/pyproject.toml                     | 2 ++
 pkgs/clan-cli/tests/__init__.py                  | 0
 pkgs/clan-cli/tests/conftest.py                  | 2 ++
 pkgs/clan-cli/tests/{ => helpers}/environment.py | 0
 pkgs/clan-cli/tests/test_clan_ssh.py             | 3 +--
 5 files changed, 5 insertions(+), 2 deletions(-)
 delete mode 100644 pkgs/clan-cli/tests/__init__.py
 create mode 100644 pkgs/clan-cli/tests/conftest.py
 rename pkgs/clan-cli/tests/{ => helpers}/environment.py (100%)

diff --git a/pkgs/clan-cli/pyproject.toml b/pkgs/clan-cli/pyproject.toml
index 4a1342cf2..58067e661 100644
--- a/pkgs/clan-cli/pyproject.toml
+++ b/pkgs/clan-cli/pyproject.toml
@@ -13,6 +13,8 @@ packages = [ "clan_cli" ]
 
 [tool.pytest.ini_options]
 addopts = "--cov . --cov-report term --cov-report html:.reports/html --no-cov-on-fail"
+norecursedirs = "tests/helpers"
+
 
 [tool.mypy]
 python_version = "3.10"
diff --git a/pkgs/clan-cli/tests/__init__.py b/pkgs/clan-cli/tests/__init__.py
deleted file mode 100644
index e69de29bb..000000000
diff --git a/pkgs/clan-cli/tests/conftest.py b/pkgs/clan-cli/tests/conftest.py
new file mode 100644
index 000000000..b389b3678
--- /dev/null
+++ b/pkgs/clan-cli/tests/conftest.py
@@ -0,0 +1,2 @@
+import os
+sys.path.append(os.path.join(os.path.dirname(__file__), 'helpers'))
diff --git a/pkgs/clan-cli/tests/environment.py b/pkgs/clan-cli/tests/helpers/environment.py
similarity index 100%
rename from pkgs/clan-cli/tests/environment.py
rename to pkgs/clan-cli/tests/helpers/environment.py
diff --git a/pkgs/clan-cli/tests/test_clan_ssh.py b/pkgs/clan-cli/tests/test_clan_ssh.py
index 628bc0ecf..ed1d366e3 100644
--- a/pkgs/clan-cli/tests/test_clan_ssh.py
+++ b/pkgs/clan-cli/tests/test_clan_ssh.py
@@ -3,12 +3,11 @@ from typing import Union
 
 import pytest
 import pytest_subprocess.fake_process
+from environment import mock_env
 from pytest_subprocess import utils
 
 import clan_cli.ssh
 
-from .environment import mock_env
-
 
 def test_no_args(
     capsys: pytest.CaptureFixture, monkeypatch: pytest.MonkeyPatch