Merge "Make SpecialPageTestBase always call parent::tearDown"

diff --git a/tests/phpunit/includes/specials/SpecialPageTestBase.php b/tests/phpunit/includes/specials/SpecialPageTestBase.php
index 4809e1b..fc9e2f0 100644 (file)
--- a/tests/phpunit/includes/specials/SpecialPageTestBase.php
+++ b/tests/phpunit/includes/specials/SpecialPageTestBase.php
@@ -28,13 +28,15 @@ abstract class SpecialPageTestBase extends MediaWikiTestCase {
                        ob_end_clean();
                }
 
-               if ( $obLevel !== $this->obLevel ) {
-                       $this->fail(
-                               "Test changed output buffer level: was {$this->obLevel} before test, but $obLevel after test."
-                       );
+               try {
+                       if ( $obLevel !== $this->obLevel ) {
+                               $this->fail(
+                                       "Test changed output buffer level: was {$this->obLevel} before test, but $obLevel after test."
+                               );
+                       }
+               } finally {
+                       parent::tearDown();
                }
-
-               parent::tearDown();
        }
 
        /**