Skip to content

Change the default formatting of YAML emitted by tmt #4338

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
happz merged 2 commits into from
Apr 14, 2026
+86 −78
Merged

Change the default formatting of YAML emitted by tmt #4338

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6e8ccca
Change the default formatting of YAML emitted by tmt
happz Nov 18, 2025
50a802e
squash: fixing tests
happz Mar 23, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
154 changes: 77 additions & 77 deletions tests/unit/test_hardware.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -305,82 +305,82 @@ def test_validate_requirements(requirements: str, root_logger: Logger) -> None:
def test_parse_maximal_constraint() -> None:
hw_spec_out = """
and:
- and:
- beaker.pool: '!= foo.*'
- beaker.panic-watchdog: == True
- boot.method: not contains exclusive bios
- and:
- compatible.distro: contains rhel-7
- compatible.distro: contains rhel-8
- and:
- cpu.processors: '> 8'
- cpu.sockets: <= 1
- cpu.cores: == 2
- cpu.threads: '>= 8'
- cpu.cores-per-socket: == 2
- cpu.threads-per-core: == 4
- cpu.model: == 62
- cpu.family: < 6
- cpu.vendor: == 32902
- cpu.stepping: '!= 10'
- cpu.frequency: '>= 2300.0 MHz'
- cpu.family-name: == Skylake
- cpu.model-name: '!~ Haswell'
- cpu.vendor-name: ~ Intel.*
- and:
- beaker.pool: '!= foo.*'
- beaker.panic-watchdog: == True
- boot.method: not contains exclusive bios
- cpu.flag: contains avx
- cpu.flag: contains avx2
- cpu.flag: not contains smep
- cpu.hyper-threading: == True
- and:
- device.vendor: '> 97'
- device.device: == 79
- device.vendor-name: '!= Intel'
- device.device-name: ~ .*Thunderbolt.*
- device.driver: == mc
- and:
- gpu.vendor: == 4318
- gpu.device: == 97
- gpu.vendor-name: == Nvidia
- gpu.device-name: == G86 [Quadro NVS 290]
- gpu.driver: ~ radeon
- memory: == 8 GiB
- and:
- and:
- compatible.distro: contains rhel-7
- compatible.distro: contains rhel-8
- disk[0].size: == 40 GiB
- disk[0].physical-sector-size: == 4096 B
- disk[0].model-name: ~ WD 100G.*
- and:
- cpu.processors: '> 8'
- cpu.sockets: <= 1
- cpu.cores: == 2
- cpu.threads: '>= 8'
- cpu.cores-per-socket: == 2
- cpu.threads-per-core: == 4
- cpu.model: == 62
- cpu.family: < 6
- cpu.vendor: == 32902
- cpu.stepping: '!= 10'
- cpu.frequency: '>= 2300.0 MHz'
- cpu.family-name: == Skylake
- cpu.model-name: '!~ Haswell'
- cpu.vendor-name: ~ Intel.*
- and:
- cpu.flag: contains avx
- cpu.flag: contains avx2
- cpu.flag: not contains smep
- cpu.hyper-threading: == True
- disk[1].size: == 120 GiB
- disk[1].logical-sector-size: == 512 B
- disk[1].driver: == virtblk
- and:
- and:
- device.vendor: '> 97'
- device.device: == 79
- device.vendor-name: '!= Intel'
- device.device-name: ~ .*Thunderbolt.*
- device.driver: == mc
- and:
- gpu.vendor: == 4318
- gpu.device: == 97
- gpu.vendor-name: == Nvidia
- gpu.device-name: == G86 [Quadro NVS 290]
- gpu.driver: ~ radeon
- memory: == 8 GiB
- and:
- and:
- disk[0].size: == 40 GiB
- disk[0].physical-sector-size: == 4096 B
- disk[0].model-name: ~ WD 100G.*
- and:
- disk[1].size: == 120 GiB
- disk[1].logical-sector-size: == 512 B
- disk[1].driver: == virtblk
- and:
- and:
- network[0].vendor: '!= 121'
- network[0].device: == 1657
- network[0].vendor-name: ~ ^Broadcom
- network[0].device-name: ~ ^NetXtreme II BCM
- network[0].driver: == iwlwifi
- network[0].type: == eth
- network[1].type: == eth
- hostname: ~ .*.foo.redhat.com
- location.lab-controller: '!= lab-1.bar.redhat.com'
- and:
- system.vendor: == 16700
- system.vendor-name: ~ Dell.*
- system.model: == 79
- system.numa-nodes: < 4
- system.model-name: ~ PowerEdge R750
- system.type: '!= Machine'
- tpm.version: == 2.0
- and:
- virtualization.is-virtualized: == False
- virtualization.is-supported: == True
- virtualization.confidential: == True
- virtualization.hypervisor: ~ xen
- and:
- zcrypt.adapter: == CEX8C
- zcrypt.mode: == CCA
- network[0].vendor: '!= 121'
- network[0].device: == 1657
- network[0].vendor-name: ~ ^Broadcom
- network[0].device-name: ~ ^NetXtreme II BCM
- network[0].driver: == iwlwifi
- network[0].type: == eth
- network[1].type: == eth
- hostname: ~ .*.foo.redhat.com
- location.lab-controller: '!= lab-1.bar.redhat.com'
- and:
- system.vendor: == 16700
- system.vendor-name: ~ Dell.*
- system.model: == 79
- system.numa-nodes: < 4
- system.model-name: ~ PowerEdge R750
- system.type: '!= Machine'
- tpm.version: == 2.0
- and:
- virtualization.is-virtualized: == False
- virtualization.is-supported: == True
- virtualization.confidential: == True
- virtualization.hypervisor: ~ xen
- and:
- zcrypt.adapter: == CEX8C
- zcrypt.mode: == CCA
"""

if PINT_VERSION < Version("0.25.3"): # noqa: SIM300 (false-positive)
Expand All @@ -400,12 +400,12 @@ def test_parse_maximal_constraint() -> None:
def test_parse_or_constraint() -> None:
hw_spec_out = """
or:
- hostname: == dummy1.redhat.com
- hostname: == dummy1.redhat.com
- or:
- hostname: == dummy2.redhat.com
- or:
- hostname: == dummy2.redhat.com
- or:
- hostname: == dummy3.redhat.com
- hostname: == dummy4.redhat.com
- hostname: == dummy3.redhat.com
- hostname: == dummy4.redhat.com
"""

hw = parse_hw(OR_HARDWARE_REQUIREMENTS)
Expand Down
10 changes: 9 additions & 1 deletion tmt/utils/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3524,7 +3524,15 @@ def _yaml(

yaml = YAML(typ=yaml_type)

yaml.indent(mapping=4, sequence=4, offset=2)
# Setting `mapping` and `offset` may lead to a subpar-looking YAML
# formatting. With some settings, it's even possible to create invalid
# YAML, with keys incorrectly indented. Setting `sequence` only seems
# to produce a usable YAML (YMMV), and `sequence=2` seems to be acceptably
# formatted.
#
# Discussed in https://github.com/teemtee/tmt/issues/3432
yaml.indent(sequence=2)
Comment thread
psss marked this conversation as resolved.

yaml.default_flow_style = False
yaml.allow_unicode = True
yaml.encoding = 'utf-8'
Expand Down
Loading