From 364300274ec7049167148f3221071079696e87a5 Mon Sep 17 00:00:00 2001
From: holger krekel <holger@merlinux.eu>
Date: Fri, 20 Oct 2023 22:56:24 +0200
Subject: [PATCH] move all tests into a root "tests" folder so they can share
 setup and config

---
 {chatmaild/src => tests}/chatmaild/test_doveauth.py     | 4 ++--
 {chatmaild/src => tests}/chatmaild/test_filtermail.py   | 2 +-
 {online-tests => tests}/conftest.py                     | 8 +++++++-
 {online-tests/mailgen => tests/mail-data}/encrypted.eml | 0
 {online-tests => tests/online}/benchmark.py             | 0
 {online-tests => tests/online}/test_0_login.py          | 0
 {online-tests => tests/online}/test_1_basic.py          | 0
 {online-tests => tests/online}/test_2_deltachat.py      | 0
 {online-tests => tests}/pytest.ini                      | 0
 9 files changed, 10 insertions(+), 4 deletions(-)
 rename {chatmaild/src => tests}/chatmaild/test_doveauth.py (93%)
 rename {chatmaild/src => tests}/chatmaild/test_filtermail.py (99%)
 rename {online-tests => tests}/conftest.py (98%)
 rename {online-tests/mailgen => tests/mail-data}/encrypted.eml (100%)
 rename {online-tests => tests/online}/benchmark.py (100%)
 rename {online-tests => tests/online}/test_0_login.py (100%)
 rename {online-tests => tests/online}/test_1_basic.py (100%)
 rename {online-tests => tests/online}/test_2_deltachat.py (100%)
 rename {online-tests => tests}/pytest.ini (100%)

diff --git a/chatmaild/src/chatmaild/test_doveauth.py b/tests/chatmaild/test_doveauth.py
similarity index 93%
rename from chatmaild/src/chatmaild/test_doveauth.py
rename to tests/chatmaild/test_doveauth.py
index 8866c9a1..590cf72f 100644
--- a/chatmaild/src/chatmaild/test_doveauth.py
+++ b/tests/chatmaild/test_doveauth.py
@@ -3,8 +3,8 @@ import os
 import pytest
 
 import chatmaild.dictproxy
-from .dictproxy import get_user_data, lookup_passdb
-from .database import Database, DBError
+from chatmaild.dictproxy import get_user_data, lookup_passdb
+from chatmaild.database import Database, DBError
 
 
 @pytest.fixture()
diff --git a/chatmaild/src/chatmaild/test_filtermail.py b/tests/chatmaild/test_filtermail.py
similarity index 99%
rename from chatmaild/src/chatmaild/test_filtermail.py
rename to tests/chatmaild/test_filtermail.py
index df737dc2..1f3b6ea4 100644
--- a/chatmaild/src/chatmaild/test_filtermail.py
+++ b/tests/chatmaild/test_filtermail.py
@@ -1,4 +1,4 @@
-from .filtermail import check_encrypted, check_DATA, SendRateLimiter
+from chatmaild.filtermail import check_encrypted, check_DATA, SendRateLimiter
 from email.parser import BytesParser
 from email import policy
 import pytest
diff --git a/online-tests/conftest.py b/tests/conftest.py
similarity index 98%
rename from online-tests/conftest.py
rename to tests/conftest.py
index 5f4eb512..5aac7fe5 100644
--- a/online-tests/conftest.py
+++ b/tests/conftest.py
@@ -6,10 +6,14 @@ import subprocess
 import imaplib
 import smtplib
 import itertools
+from pathlib import Path
 from math import ceil
 import pytest
 
 
+conftestdir = Path(__file__).parent
+
+
 def pytest_addoption(parser):
     parser.addoption(
         "--slow", action="store_true", default=False, help="also run slow tests"
@@ -282,9 +286,11 @@ class Remote:
 
 @pytest.fixture
 def mailgen(request):
+    datadir = conftestdir.joinpath("mail-data")
+
     class Mailgen:
         def get_encrypted(self, from_addr, to_addr):
-            data = request.fspath.dirpath("mailgen/encrypted.eml").read()
+            data = datadir.joinpath("encrypted.eml").read_text()
             return data.format(from_addr=from_addr, to_addr=to_addr)
 
     return Mailgen()
diff --git a/online-tests/mailgen/encrypted.eml b/tests/mail-data/encrypted.eml
similarity index 100%
rename from online-tests/mailgen/encrypted.eml
rename to tests/mail-data/encrypted.eml
diff --git a/online-tests/benchmark.py b/tests/online/benchmark.py
similarity index 100%
rename from online-tests/benchmark.py
rename to tests/online/benchmark.py
diff --git a/online-tests/test_0_login.py b/tests/online/test_0_login.py
similarity index 100%
rename from online-tests/test_0_login.py
rename to tests/online/test_0_login.py
diff --git a/online-tests/test_1_basic.py b/tests/online/test_1_basic.py
similarity index 100%
rename from online-tests/test_1_basic.py
rename to tests/online/test_1_basic.py
diff --git a/online-tests/test_2_deltachat.py b/tests/online/test_2_deltachat.py
similarity index 100%
rename from online-tests/test_2_deltachat.py
rename to tests/online/test_2_deltachat.py
diff --git a/online-tests/pytest.ini b/tests/pytest.ini
similarity index 100%
rename from online-tests/pytest.ini
rename to tests/pytest.ini