Merge ~adam-collard/maas-ci/+git/system-tests:yaml-split-config-check into ~maas-committers/maas-ci/+git/system-tests:master

Proposed by Adam Collard
Status: Merged
Approved by: Adam Collard
Approved revision: d3aa37f0f5f7c247dd283077c8ac0bb268ddbaed
Merge reported by: MAAS Lander
Merged at revision: not available
Proposed branch: ~adam-collard/maas-ci/+git/system-tests:yaml-split-config-check
Merge into: ~maas-committers/maas-ci/+git/system-tests:master
Diff against target: 40 lines (+5/-2)
2 files modified
setup.py (+1/-0)
systemtests/conftest.py (+4/-2)
Reviewer Review Type Date Requested Status
Anton Troyanov Approve
MAAS Lander Approve
Review via email: mp+428531@code.launchpad.net

Commit message

Use ruamel.yaml to parse YAML 1.2 docs that come out of gen_config

Avoids issue with "no" -> no -> False

To post a comment you must log in.
Revision history for this message
MAAS Lander (maas-lander) wrote :

UNIT TESTS
-b yaml-split-config-check lp:~adam-collard/maas-ci/+git/system-tests into -b master lp:~maas-committers/maas-ci/+git/system-tests

STATUS: SUCCESS
COMMIT: d3aa37f0f5f7c247dd283077c8ac0bb268ddbaed

review: Approve
Revision history for this message
Anton Troyanov (troyanov) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
diff --git a/setup.py b/setup.py
index 10c8b5e..21d75cd 100644
--- a/setup.py
+++ b/setup.py
@@ -8,6 +8,7 @@ install_requires = (
8 'pytest-steps',8 'pytest-steps',
9 'pyyaml',9 'pyyaml',
10 'retry',10 'retry',
11 'ruamel.yaml',
11)12)
1213
1314
diff --git a/systemtests/conftest.py b/systemtests/conftest.py
index e669a69..234c9fa 100644
--- a/systemtests/conftest.py
+++ b/systemtests/conftest.py
@@ -4,7 +4,7 @@ from logging import getLogger
4from typing import TYPE_CHECKING, Any, Iterator4from typing import TYPE_CHECKING, Any, Iterator
55
6import pytest6import pytest
7import yaml7from ruamel.yaml import YAML
88
9if TYPE_CHECKING:9if TYPE_CHECKING:
10 from .api import AuthenticatedAPIClient10 from .api import AuthenticatedAPIClient
@@ -75,11 +75,13 @@ STATUS_READY = 4
7575
76LOG = getLogger("systemtests.conftest")76LOG = getLogger("systemtests.conftest")
7777
78yaml = YAML()
79
7880
79def pytest_addoption(parser: Parser) -> None:81def pytest_addoption(parser: Parser) -> None:
80 def config_type(filename: str) -> dict[str, Any]:82 def config_type(filename: str) -> dict[str, Any]:
81 with open(filename, "r") as fh:83 with open(filename, "r") as fh:
82 config: dict[str, Any] = yaml.safe_load(fh)84 config: dict[str, Any] = yaml.load(fh)
83 return config85 return config
8486
85 parser.addoption(87 parser.addoption(

Subscribers

People subscribed via source and target branches

to all changes: