Backport 950417e for #2236

sebastianbergmann · Dec 28, 2017 · b7654e5 · b7654e5
1 parent dd8aaee
commit b7654e5
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/src/Framework/TestCase.php b/src/Framework/TestCase.php
@@ -945,11 +945,6 @@ public function runBare()
             $e = $_e;
         }
 
-        if (isset($_e)) {
-            $this->status        = PHPUnit_Runner_BaseTestRunner::STATUS_ERROR;
-            $this->statusMessage = $_e->getMessage();
-        }
-
         // Clean up the mock objects.
         $this->mockObjects = [];
         $this->prophet     = null;
@@ -986,6 +981,11 @@ public function runBare()
             }
         }
 
+        if (isset($_e)) {
+            $this->status        = PHPUnit_Runner_BaseTestRunner::STATUS_ERROR;
+            $this->statusMessage = $_e->getMessage();
+        }
+
         clearstatcache();
 
         if ($currentWorkingDirectory != getcwd()) {

diff --git a/tests/Framework/TestCaseTest.php b/tests/Framework/TestCaseTest.php
@@ -159,6 +159,7 @@ public function testExceptionInTearDown()
         $this->assertTrue($test->testSomething);
         $this->assertTrue($test->assertPostConditions);
         $this->assertTrue($test->tearDown);
+        $this->assertEquals(PHPUnit_Runner_BaseTestRunner::STATUS_ERROR, $test->getStatus());
     }
 
     public function testNoArgTestCasePasses()