Debug XFails

Author: Vipul-Cariappa

.github/workflows/MacOS.yml

@@ -559,52 +559,20 @@ jobs:
       run: |
         # Run the tests
         source ${{ github.workspace }}/CppInterOp/.venv/bin/activate
-        cd ${{ github.workspace }}/test/
+        cd ${{ github.workspace }}/test
         echo ::group::Prepare For Testing
         make all
         python -m pip install --upgrade pip
         python -m pip install pytest
         python -m pip install pytest-xdist
         python -m pip install numba
         echo ::endgroup::
-        echo ::group::Run complete test suite
-        set -o pipefail
-        python -m pytest -sv -ra | tee complete_testrun.log 2>&1
-        set +o pipefail
         echo ::group::Crashing Test Logs
-        # See if we don't have a crash that went away
-        # Comment out all xfails but the ones that have a run=False condition.
-        find . -name "*.py" -exec sed -i '/run=False/!s/^ *@mark.xfail\(.*\)/#&/' {} \;
-        python -m pytest -n 1 -m "xfail" --runxfail -sv -ra --max-worker-restart 512 | tee test_crashed.log 2>&1 || true
-        git checkout .
+        python -m pytest -n 1 -v -ra --max-worker-restart 512 | tee test_crashed.log 2>&1 || true
         echo ::endgroup::
-        echo ::group::XFAIL Test Logs
-        # Rewrite all xfails that have a run clause to skipif. This way we will
-        # avoid conditionally crashing xfails
-        find . -name "*.py" -exec gsed -i -E 's/(^ *)@mark.xfail\(run=(.*)/\[email protected](condition=not \2/g' {} \;
-        # See if we don't have an xfail that went away
-        python -m pytest --runxfail -sv -ra  | tee test_xfailed.log 2>&1 || true
-        git checkout .
-        echo ::endgroup::
-        echo ::group::Passing Test Logs
-
-        # Run the rest of the non-crashing tests.
-        declare -i RETCODE=0
-
-        set -o pipefail
-        export RETCODE=+$?
-        echo ::endgroup::
-
-        RETCODE=+$?
 
-        echo "Complete Test Suite Summary: \n"
-        tail -n1 complete_testrun.log
-        echo "Crashing Summary: \n"
+        echo "Crashing Summary:"
         tail -n1 test_crashed.log
-        echo "XFAIL Summary:"
-        tail -n1 test_xfailed.log
-        echo "Return Code: ${RETCODE}"
-        exit $RETCODE
             
     - name: Show debug info
       if: ${{ failure() }}

.github/workflows/Ubuntu.yml

@@ -670,10 +670,6 @@ jobs:
         python -m uv pip install numba
         python -m uv pip install psutil
         echo ::endgroup::
-        echo ::group::Run complete test suite
-        set -o pipefail
-        python -m pytest -sv -ra | tee complete_testrun.log 2>&1
-        set +o pipefail
         echo ::group::Crashing Test Logs
         # See if we don't have a crash that went away
         # Comment out all xfails but the ones that have a run=False condition.
@@ -705,20 +701,12 @@ jobs:
           SUPPRESSION_FILE="../etc/clang${CLANG_VERSION}-valgrind.supp"
         fi
 
-        valgrind --show-error-list=yes --error-exitcode=1 --track-origins=yes --gen-suppressions=all --suppressions="${SUPPRESSION_FILE}" --suppressions=../etc/valgrind-cppyy-cling.supp python -m pytest -m "not xfail" -sv -ra --ignore=test_leakcheck.py
+        valgrind --show-error-list=yes --error-exitcode=1 --track-origins=yes --gen-suppressions=all --suppressions="${SUPPRESSION_FILE}" --suppressions=../etc/valgrind-cppyy-cling.supp python -m pytest -m "not xfail" -sv -ra
         export RETCODE=+$?
         echo ::endgroup::
 
-        RETCODE=+$?
-
-        echo "Complete Test Suite Summary: \n"
-        tail -n1 complete_testrun.log
-        echo "Crashing Summary: \n"
+        echo "Crashing Summary:"
         tail -n1 test_crashed.log
-        echo "XFAIL Summary:"
-        tail -n1 test_xfailed.log
-        echo "Return Code: ${RETCODE}"
-        exit $RETCODE
 
     - name: Show debug info
       if: ${{ failure() }}

test/support.py

@@ -74,3 +74,12 @@ def setup_make(targetname):
                                             true
                                             #endif\n""") == 1)
 IS_CLING = not IS_CLANG_REPL
+
+from pytest import mark
+
+proxy = mark.xfail
+def monkey_patch(*args, **kwargs):
+    if "run" in kwargs:
+        del kwargs["run"]
+
+    return proxy(*args, **kwargs)

test/test_aclassloader.py

@@ -1,6 +1,8 @@
 import py, os, sys
 from pytest import raises, mark
-from .support import setup_make
+from .support import setup_make, monkey_patch
+
+mark.xfail = monkey_patch
 
 currpath = py.path.local(__file__).dirpath()
 test_dct = str(currpath.join("example01Dict"))

test/test_advancedcpp.py

@@ -1,6 +1,9 @@
 import py, os, sys
 from pytest import raises, skip, mark
-from .support import setup_make, pylong, IS_WINDOWS, IS_MAC, IS_LINUX, ispypy, IS_CLANG_REPL, IS_MAC_ARM, IS_MAC_X86
+from .support import setup_make, pylong, IS_WINDOWS, IS_MAC, IS_LINUX, ispypy, IS_CLANG_REPL, IS_MAC_ARM, IS_MAC_X86, monkey_patch
+
+mark.xfail = monkey_patch
+
 
 currpath = py.path.local(__file__).dirpath()
 test_dct = str(currpath.join("advancedcppDict"))

test/test_api.py

@@ -1,6 +1,8 @@
 import py, os, sys
 from pytest import raises, skip, mark
-from .support import ispypy, IS_MAC, IS_LINUX_ARM
+from .support import ispypy, IS_MAC, IS_LINUX_ARM, monkey_patch
+
+mark.xfail = monkey_patch
 
 
 class TestAPI:

test/test_boost.py

@@ -1,6 +1,9 @@
 import py, os, sys
 from pytest import mark, raises, skip
-from .support import setup_make, IS_CLANG_REPL, IS_MAC_X86, IS_MAC_ARM
+from .support import setup_make, IS_CLANG_REPL, IS_MAC_X86, IS_MAC_ARM, monkey_patch
+
+mark.xfail = monkey_patch
+
 
 noboost = False
 if not (os.path.exists(os.path.join(os.path.sep, 'usr', 'include', 'boost')) or \

test/test_concurrent.py

@@ -1,6 +1,8 @@
 import py, os, sys
 from pytest import raises, skip, mark
-from .support import IS_MAC_ARM, IS_MAC_X86, IS_LINUX_ARM
+from .support import IS_MAC_ARM, IS_MAC_X86, IS_LINUX_ARM, monkey_patch
+
+mark.xfail = monkey_patch
 
 
 class TestCONCURRENT:

test/test_conversions.py

@@ -1,6 +1,9 @@
 import py, os, sys
 from pytest import raises, mark
-from .support import setup_make, IS_LINUX, IS_CLANG_REPL, IS_CLING, IS_MAC
+from .support import setup_make, IS_LINUX, IS_CLANG_REPL, IS_CLING, IS_MAC, monkey_patch
+
+mark.xfail = monkey_patch
+
 
 currpath = py.path.local(__file__).dirpath()
 test_dct = str(currpath.join("conversionsDict"))

test/test_cpp11features.py

@@ -1,6 +1,8 @@
 import py, os, sys
 from pytest import raises, mark
-from .support import setup_make, ispypy, IS_CLANG_REPL, IS_LINUX_ARM, IS_LINUX, IS_MAC, IS_CLING
+from .support import setup_make, ispypy, IS_CLANG_REPL, IS_LINUX_ARM, IS_LINUX, IS_MAC, IS_CLING, monkey_patch
+
+mark.xfail = monkey_patch
 
 
 currpath = py.path.local(__file__).dirpath()