From 0a5fc8dcc699f53e9cd7c1c4aed2eccbb17e5ce2 Mon Sep 17 00:00:00 2001
From: Aryeh Gregor <ayg@aryeh.name>
Date: Mon, 8 Oct 2018 19:54:32 +0300
Subject: [PATCH] Make SpecialPageTestBase always call parent::tearDown

Change-Id: Ifc244d5117e7da4bf46cdf273eca9fc4ae5c3a42
---
 .../includes/specials/SpecialPageTestBase.php      | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/tests/phpunit/includes/specials/SpecialPageTestBase.php b/tests/phpunit/includes/specials/SpecialPageTestBase.php
index 4809e1b874..fc9e2f0d79 100644
--- 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();
 	}
 
 	/**
-- 
2.20.1