Call cleanup functions if explicit teardown is needed

Fix pytest-dev#6947

AUTHORS

@@ -211,6 +211,7 @@ Omar Kohl
 Omer Hadari
 Ondřej Súkup
 Oscar Benjamin
+Pablo Aguiar
 Patrick Hayes
 Pauli Virtanen
 Paweł Adamczak

changelog/6947.bugfix.rst

@@ -0,0 +1 @@
+Call cleanup functions on test failure.

src/_pytest/unittest.py

@@ -122,6 +122,7 @@ def setup(self):
     def teardown(self):
         if self._needs_explicit_tearDown:
             self._testcase.tearDown()
+            self._testcase.doCleanups()
         self._testcase = None
         self._obj = None
 

testing/test_unittest.py

@@ -876,6 +876,24 @@ def test_notTornDown():
     reprec.assertoutcome(passed=1, failed=1)
 
 
+def test_call_cleanup_functions_on_test_failure(testdir):
+    testdir.makepyfile(
+        """
+        import unittest
+        class TC(unittest.TestCase):
+            def setUp(self):
+                self.addCleanup(lambda: print("someCleanup()"))
+            def test_method(self):
+                assert False
+    """
+    )
+    result = testdir.runpytest("-s")
+    assert result.ret == 1
+    result.stdout.fnmatch_lines(
+        ["*someCleanup()*", "*test_method*", "*assert False*", "*1 failed*"]
+    )
+
+
 def test_issue333_result_clearing(testdir):
     testdir.makeconftest(
         """