Skip to content

Commit 8803f6e

Browse files
committed
test: sort parameters for pytest-xdist
Otherwise pytest-xdist complains that the order is not stable Signed-off-by: Pablo Barbáchano <[email protected]>
1 parent 7a6afd4 commit 8803f6e

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

tests/framework/utils_cpu_templates.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ def get_supported_cpu_templates():
2525
# T2CL template is only supported on Cascade Lake and newer CPUs.
2626
skylake_model = "Intel(R) Xeon(R) Platinum 8175M CPU @ 2.50GHz"
2727
if cpuid_utils.get_cpu_model_name() == skylake_model:
28-
return set(INTEL_TEMPLATES) - set(["T2CL"])
28+
return sorted(set(INTEL_TEMPLATES) - set(["T2CL"]))
2929
return INTEL_TEMPLATES
3030
case cpuid_utils.CpuVendor.AMD:
3131
return AMD_TEMPLATES

tests/integration_tests/functional/test_cpu_features.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -241,7 +241,7 @@ def test_brand_string(test_microvm_with_api, network_config):
241241

242242
@pytest.fixture(
243243
name="msr_cpu_template",
244-
params=set(SUPPORTED_CPU_TEMPLATES).intersection(MSR_SUPPORTED_TEMPLATES),
244+
params=sorted(set(SUPPORTED_CPU_TEMPLATES).intersection(MSR_SUPPORTED_TEMPLATES)),
245245
)
246246
def msr_cpu_template_fxt(request):
247247
"""CPU template fixture for MSR read/write supported CPU templates"""

0 commit comments

Comments
 (0)