From 01b61b5e6a91e3a44dbc3f57db27b4d126da2396 Mon Sep 17 00:00:00 2001 From: Daimona Eaytoy Date: Fri, 15 Jan 2021 13:01:19 +0100 Subject: [PATCH] Re-enable AbuseFilterBlockTest::testRevert Bug: T272124 Change-Id: Ic8ee8d2ce2b04e5cd0345efdb1e8f9653ef83bf3 --- tests/phpunit/AbuseFilterBlockTest.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/phpunit/AbuseFilterBlockTest.php b/tests/phpunit/AbuseFilterBlockTest.php index b2726416c..284e3ce74 100644 --- a/tests/phpunit/AbuseFilterBlockTest.php +++ b/tests/phpunit/AbuseFilterBlockTest.php @@ -147,7 +147,8 @@ class AbuseFilterBlockTest extends MediaWikiIntegrationTestCase { * @todo This sucks. Clean it up once T255433 and T253717 are resolved */ public function testRevert( ?stdClass $blockRow, ?DatabaseBlockStore $blockStore, bool $expected ) { - $this->markTestSkipped( 'T272124' ); + // Unset all hook handlers per T272124 + $this->setService( 'HookContainer', $this->createHookContainer() ); $db = $this->createMock( IDatabase::class ); $db->method( 'select' )->willReturnCallback( function ( $tables ) use ( $blockRow ) { return in_array( 'ipblocks', $tables, true ) && $blockRow ? [ $blockRow ] : [];