From 533930e4f25494316ea7bc06bcc84b452b2fa529 Mon Sep 17 00:00:00 2001 From: "Lovett, Trevor" Date: Wed, 5 Jun 2019 23:00:10 -0500 Subject: [VVP] Removed yamllint library Change-Id: If2c26b8650e8aba0a183d0cf47b1b3744dbfaf95 Issue-ID: VVP-201 Signed-off-by: Lovett, Trevor --- ice_validator/tests/conftest.py | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) (limited to 'ice_validator/tests/conftest.py') diff --git a/ice_validator/tests/conftest.py b/ice_validator/tests/conftest.py index d07669c..69f6524 100644 --- a/ice_validator/tests/conftest.py +++ b/ice_validator/tests/conftest.py @@ -393,19 +393,26 @@ def pytest_collection_modifyitems(session, config, items): ): item.add_marker( pytest.mark.skip( - reason=("Test categories do not match " - "all the passed categories") + reason=( + "Test categories do not match " + "all the passed categories" + ) ) ) else: item.add_marker( pytest.mark.skip( - reason=("Test belongs to a category but " - "no categories were passed") + reason=( + "Test belongs to a category but " + "no categories were passed" + ) ) ) + items.sort( - key=lambda x: 0 if "base" in set(m.name for m in x.iter_markers()) else 1 + key=lambda x: (0, x.name) + if "base" in set(m.name for m in x.iter_markers()) + else (1, x.name) ) -- cgit 1.2.3-korg