From 5cb6317e84178beb054230ae88d3af1a882920cf Mon Sep 17 00:00:00 2001 From: "stark, steven" Date: Thu, 30 Aug 2018 14:22:33 -0700 Subject: [PATCH] [VVP] pytest --self-test xfail validation scripts pytest --self-test "xfail" being skipped Issue-ID: VVP-108 Change-Id: I1bdb146db3de78b393315499491b3ad65597213c Signed-off-by: stark, steven --- ice_validator/tests/conftest.py | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/ice_validator/tests/conftest.py b/ice_validator/tests/conftest.py index 09baa9a..598fc01 100644 --- a/ice_validator/tests/conftest.py +++ b/ice_validator/tests/conftest.py @@ -70,7 +70,11 @@ report = collections.OrderedDict(report_columns) def extract_error_msg(rep): - msg = str(rep.longrepr.reprcrash) + try: + msg = str(rep.longrepr.reprcrash) + except AttributeError: + msg = str(rep) + if "AssertionError:" in msg: return msg.split("AssertionError:")[1] else: @@ -142,9 +146,9 @@ def pytest_sessionfinish(session, exitstatus): def pytest_runtest_setup(item): profile = item.session.config.option.validation_profile markers = set(m.name for m in item.iter_markers()) - if not profile and markers: + if not profile and markers and "xfail" not in markers: pytest.skip("No validation profile selected. Skipping tests with marks.") - if profile and markers and profile not in markers: + if profile and markers and profile not in markers and "xfail" not in markers: pytest.skip("Doesn't match selection validation profile") -- 2.16.6