Skip to content

Commit c50e580

Browse files
authored
Merge branch 'main' into testGuestLoadMetrics
2 parents 6802927 + 2b72f6b commit c50e580

File tree

4 files changed

+19
-2
lines changed

4 files changed

+19
-2
lines changed

docs/QUARANTINE.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
## TODO: Add full procedure for quarantine and de-quarantine
2+
## De-quarantine: add a section on pytest-repeat and how to use it

pyproject.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,7 @@ packages = ["*"]
9999
dev = [
100100
"ipdb>=0.13.13",
101101
"ipython>=8.12.3",
102+
"pytest-repeat>=0.9.4",
102103
]
103104

104105
[tool.uv.sources]

tests/virt/cluster/common_templates/utils.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -531,7 +531,7 @@ def _check_hyperv_recommendations():
531531
]
532532

533533
if failed_vm_recommendations:
534-
failed_recommendations.append(failed_vm_recommendations)
534+
failed_recommendations.extend(failed_vm_recommendations)
535535

536536
spinlocks = vm_recommendations_dict["SpinlockRetries"]
537537
if int(spinlocks) != 8191:
@@ -575,7 +575,7 @@ def _check_hyperv_features():
575575
failed_windows_hyperv_list.extend(_check_hyperv_features())
576576

577577
if not hvinfo_dict["HyperVsupport"]:
578-
failed_windows_hyperv_list.extend("HyperVsupport")
578+
failed_windows_hyperv_list.append("HyperVsupport")
579579

580580
assert not failed_windows_hyperv_list, (
581581
f"The following hyperV flags are not set correctly in the guest: {failed_windows_hyperv_list}\n"

uv.lock

Lines changed: 14 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)