sts-sponsors team mailing list archive
-
sts-sponsors team
-
Mailing list archive
-
Message #04847
[Merge] ~adam-collard/maas-ci/+git/system-tests:rewrite-assertions into ~maas-committers/maas-ci/+git/system-tests:master
Adam Collard has proposed merging ~adam-collard/maas-ci/+git/system-tests:rewrite-assertions into ~maas-committers/maas-ci/+git/system-tests:master.
Commit message:
Move asserting rewriting into conftest, add fixtures
Requested reviews:
MAAS Committers (maas-committers)
For more details, see:
https://code.launchpad.net/~adam-collard/maas-ci/+git/system-tests/+merge/436390
--
Your team MAAS Committers is requested to review the proposed merge of ~adam-collard/maas-ci/+git/system-tests:rewrite-assertions into ~maas-committers/maas-ci/+git/system-tests:master.
diff --git a/systemtests/__init__.py b/systemtests/__init__.py
index 77623bb..e69de29 100644
--- a/systemtests/__init__.py
+++ b/systemtests/__init__.py
@@ -1,9 +0,0 @@
-import pytest
-
-pytest.register_assert_rewrite(
- "systemtests.api",
- "systemtests.region",
- "systemtests.state",
- "systemtests.subprocess",
- "systemtests.utils",
-)
diff --git a/systemtests/conftest.py b/systemtests/conftest.py
index 39c59a0..4b1259e 100644
--- a/systemtests/conftest.py
+++ b/systemtests/conftest.py
@@ -80,6 +80,15 @@ LOG = getLogger("systemtests.conftest")
yaml = YAML()
+pytest.register_assert_rewrite(
+ "systemtests.api",
+ "systemtests.fixtures",
+ "systemtests.region",
+ "systemtests.state",
+ "systemtests.subprocess",
+ "systemtests.utils",
+)
+
def pytest_addoption(parser: Parser) -> None:
def config_type(filename: str) -> dict[str, Any]:
with open(filename, "r") as fh:
Follow ups