From 7cd3f4dd3cfaffe7e9de3d14a2bc90712cd9bb65 Mon Sep 17 00:00:00 2001
From: Jonathan Weth <git@jonathanweth.de>
Date: Sat, 19 Feb 2022 17:57:51 +0100
Subject: [PATCH] Move all test stuff to tests sub dir
---
aleksis/apps/matrix/tests/conftest.py | 55 +++++++++++++++++++
.../matrix/tests/synapse}/homeserver.yaml | 0
.../matrix.aleksis.example.org.log.config | 0
.../matrix.aleksis.example.org.signing.key | 0
conftest.py | 50 -----------------
5 files changed, 55 insertions(+), 50 deletions(-)
create mode 100644 aleksis/apps/matrix/tests/conftest.py
rename {synapse => aleksis/apps/matrix/tests/synapse}/homeserver.yaml (100%)
rename {synapse => aleksis/apps/matrix/tests/synapse}/matrix.aleksis.example.org.log.config (100%)
rename {synapse => aleksis/apps/matrix/tests/synapse}/matrix.aleksis.example.org.signing.key (100%)
diff --git a/aleksis/apps/matrix/tests/conftest.py b/aleksis/apps/matrix/tests/conftest.py
new file mode 100644
index 0000000..eadfed8
--- /dev/null
+++ b/aleksis/apps/matrix/tests/conftest.py
@@ -0,0 +1,55 @@
+import os
+
+import pytest
+import yaml
+from xprocess import ProcessStarter
+
+
+@pytest.fixture
+def synapse(xprocess, tmp_path):
+ path = os.path.dirname(__file__)
+ new_config_filename = os.path.join(tmp_path, "homeserver.yaml")
+
+ files_to_replace = [
+ "homeserver.yaml",
+ "matrix.aleksis.example.org.log.config",
+ ]
+ for filename in files_to_replace:
+ new_filename = os.path.join(tmp_path, filename)
+
+ with open(os.path.join(path, "synapse", filename), "r") as read_file:
+ content = read_file.read()
+
+ content = content.replace("%path%", path)
+ content = content.replace("%tmp_path%", str(tmp_path))
+
+ with open(new_filename, "w") as write_file:
+ write_file.write(content)
+
+ with open(new_config_filename, "r") as f:
+ config = yaml.safe_load(f)
+
+ config["server_url"] = "http://127.0.0.1:8008"
+
+ class SynapseStarter(ProcessStarter):
+ # startup pattern
+ pattern = "SynapseSite starting on 8008"
+
+ # command to start process
+ args = [
+ "python",
+ "-m",
+ "synapse.app.homeserver",
+ "--enable-registration",
+ "-c",
+ new_config_filename,
+ ]
+
+ max_read_lines = 400
+ timeout = 10
+
+ xprocess.ensure("synapse", SynapseStarter)
+
+ yield config
+
+ xprocess.getinfo("synapse").terminate()
diff --git a/synapse/homeserver.yaml b/aleksis/apps/matrix/tests/synapse/homeserver.yaml
similarity index 100%
rename from synapse/homeserver.yaml
rename to aleksis/apps/matrix/tests/synapse/homeserver.yaml
diff --git a/synapse/matrix.aleksis.example.org.log.config b/aleksis/apps/matrix/tests/synapse/matrix.aleksis.example.org.log.config
similarity index 100%
rename from synapse/matrix.aleksis.example.org.log.config
rename to aleksis/apps/matrix/tests/synapse/matrix.aleksis.example.org.log.config
diff --git a/synapse/matrix.aleksis.example.org.signing.key b/aleksis/apps/matrix/tests/synapse/matrix.aleksis.example.org.signing.key
similarity index 100%
rename from synapse/matrix.aleksis.example.org.signing.key
rename to aleksis/apps/matrix/tests/synapse/matrix.aleksis.example.org.signing.key
diff --git a/conftest.py b/conftest.py
index bdd05de..8dc44cf 100644
--- a/conftest.py
+++ b/conftest.py
@@ -5,53 +5,3 @@ import yaml
from xprocess import ProcessStarter
pytest_plugins = ("celery.contrib.pytest",)
-
-
-@pytest.fixture
-def synapse(xprocess, tmp_path):
- path = os.path.dirname(__file__)
- new_config_filename = os.path.join(tmp_path, "homeserver.yaml")
-
- files_to_replace = [
- "homeserver.yaml",
- "matrix.aleksis.example.org.log.config",
- ]
- for filename in files_to_replace:
- new_filename = os.path.join(tmp_path, filename)
-
- with open(os.path.join(path, "synapse", filename), "r") as read_file:
- content = read_file.read()
-
- content = content.replace("%path%", path)
- content = content.replace("%tmp_path%", str(tmp_path))
-
- with open(new_filename, "w") as write_file:
- write_file.write(content)
-
- with open(new_config_filename, "r") as f:
- config = yaml.safe_load(f)
-
- config["server_url"] = "http://127.0.0.1:8008"
-
- class SynapseStarter(ProcessStarter):
- # startup pattern
- pattern = "SynapseSite starting on 8008"
-
- # command to start process
- args = [
- "python",
- "-m",
- "synapse.app.homeserver",
- "--enable-registration",
- "-c",
- new_config_filename,
- ]
-
- max_read_lines = 400
- timeout = 10
-
- xprocess.ensure("synapse", SynapseStarter)
-
- yield config
-
- xprocess.getinfo("synapse").terminate()
--
GitLab