From: Timo Tijhof <krinklemail@gmail.com>
Date: Fri, 21 Aug 2015 14:52:09 +0000 (+0200)
Subject: Remove redundant comment-stripping in OutputPageTest
X-Git-Tag: 1.31.0-rc.0~10327
X-Git-Url: http://git.cyclocoop.org//%27%40script%40/%27?a=commitdiff_plain;h=e3d3099dd5dd2e1194062f6a5fc48af45181833d;p=lhc%2Fweb%2Fwiklou.git

Remove redundant comment-stripping in OutputPageTest

Follows-up 471a3bfb3d which removed the cacheReport from the output.

Change-Id: I3eb701cf5cd5a46f2f9aed23cb830347d999043e
---

diff --git a/tests/phpunit/includes/OutputPageTest.php b/tests/phpunit/includes/OutputPageTest.php
index 85c2220910..8c8b8b2892 100644
--- a/tests/phpunit/includes/OutputPageTest.php
+++ b/tests/phpunit/includes/OutputPageTest.php
@@ -256,8 +256,7 @@ class OutputPageTest extends MediaWikiTestCase {
 			) ),
 		) );
 		$links = $method->invokeArgs( $out, $args );
-		// Strip comments to avoid variation due to wgDBname in WikiID and cache key
-		$actualHtml = preg_replace( '#/\*[^*]+\*/#', '', implode( "\n", $links['html'] ) );
+		$actualHtml = implode( "\n", $links['html'] );
 		$this->assertEquals( $expectedHtml, $actualHtml );
 	}
 }