python-stdlib/unittest-discover: Handle expectedfauliures in unitest.

Signed-off-by: Jos Verlinde <Jos_Verlinde@hotmail.com>

Author: Josverl

python-stdlib/unittest-discover/unittest/__main__.py

@@ -146,8 +146,8 @@ def discover_main():
         # Ensure an appropriate output is printed if no tests are found.
         runner.run(TestSuite())
 
-    # Terminate with non zero return code in case of failures.
-    sys.exit(result.failuresNum + result.errorsNum)
+    # Non-zero exit on failures; an unexpected success counts as a failure too.
+    sys.exit(result.failuresNum + result.errorsNum + result.unexpectedSuccessesNum)
 
 
 discover_main()

python-stdlib/unittest/tests/unexpected_success.py

@@ -0,0 +1,14 @@
+# @expectedFailure test that unexpectedly passes -> the run must exit non-zero.
+# Not named "test_*.py" so discovery skips it; tools/ci.sh runs it explicitly.
+
+import unittest
+
+
+class TestUnexpectedSuccess(unittest.TestCase):
+    @unittest.expectedFailure
+    def test_unexpectedly_passes(self):
+        self.assertEqual(1, 1)
+
+
+if __name__ == "__main__":
+    unittest.main()

tools/ci.sh

@@ -111,6 +111,15 @@ function ci_package_tests_run {
         if [ $? -ne 0 ]; then false; return; fi
     done
 
+    # unexpected_success.py isn't named "test_*.py" so discovery skips it; run it
+    # explicitly and assert an unexpected success exits non-zero (like CPython).
+    echo "Running test python-stdlib/unittest/tests/unexpected_success.py (expecting failure)"
+    if (cd python-stdlib/unittest/tests && "${MICROPYTHON}" -m unittest unexpected_success.py); then
+        echo "Error: an unexpected success did not produce a non-zero exit code"
+        false
+        return
+    fi
+
     (cd micropython/usb/usb-device && "${MICROPYTHON}" -m tests.test_core_buffer)
     if [ $? -ne 0 ]; then false; return; fi