From 0ccd20ec18f4d26fcdbd51b9048dd5b47edcd03a Mon Sep 17 00:00:00 2001
From: Kosta Harlan <kharlan@wikimedia.org>
Date: Thu, 5 Sep 2019 09:14:28 +0200
Subject: [PATCH] Tests: Provide clearer error when config is accessed via unit
 test

Bug: T231288
Change-Id: I67622f5ed5e9dc901f5b71a6a2f61cbebe51184b
---
 tests/phpunit/MediaWikiUnitTestCase.php | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/tests/phpunit/MediaWikiUnitTestCase.php b/tests/phpunit/MediaWikiUnitTestCase.php
index 3f876ae4aa..4bd28b7f06 100644
--- a/tests/phpunit/MediaWikiUnitTestCase.php
+++ b/tests/phpunit/MediaWikiUnitTestCase.php
@@ -20,6 +20,7 @@
  */
 
 use PHPUnit\Framework\TestCase;
+use PHPUnit\Framework\Exception;
 
 /**
  * Base class for unit tests.
@@ -84,6 +85,22 @@ abstract class MediaWikiUnitTestCase extends TestCase {
 		}
 	}
 
+	/**
+	 * @inheritDoc
+	 */
+	protected function runTest() {
+		try {
+			return parent::runTest();
+		} catch ( ConfigException $exception ) {
+			throw new Exception(
+				'Config variables must be mocked, they cannot be accessed directly in tests which extend '
+				. self::class,
+				$exception->getCode(),
+				$exception
+			);
+		}
+	}
+
 	protected function tearDown() {
 		if ( !defined( 'HHVM_VERSION' ) ) {
 			// Quick reset between tests
-- 
2.20.1