X-Git-Url: https://git.cyclocoop.org/?a=blobdiff_plain;f=tests%2FtestHelpers.inc;h=6d3ac2f5cbf5dce16edd8e1e68b4e2f926996d2d;hb=95981990138dc6fc4b888f5f372bc57e24e3ebe5;hp=b5fc80032684e2b1be96ba3f1ddf34ea0741574f;hpb=73a1b801e6627d5be2d01804674f8b21abb31806;p=lhc%2Fweb%2Fwiklou.git

diff --git a/tests/testHelpers.inc b/tests/testHelpers.inc
index b5fc800326..6d3ac2f5cb 100644
--- a/tests/testHelpers.inc
+++ b/tests/testHelpers.inc
@@ -471,7 +471,7 @@ class TestFileIterator implements Iterator {
 		$hooksResult = $this->delayedParserTest->unleash( $this->parserTest );
 		if ( !$hooksResult ) {
 			# Some hook reported an issue. Abort.
-			throw new MWException( "Problem running hook" );
+			throw new MWException( "Problem running requested parser hook from the test file" );
 		}
 
 		$this->test = array(
@@ -618,6 +618,7 @@ class TestFileIterator implements Iterator {
 	 * @param bool $fatal True iff an exception should be thrown if
 	 * the section is not found.
 	 * @return bool|string
+	 * @throws MWException
 	 */
 	private function checkSection( $tokens, $fatal = true ) {
 		if ( is_null( $this->section ) ) {
@@ -691,6 +692,7 @@ class DelayedParserTest {
 	 * Should be the case if we found the parserTest is not disabled
 	 * @param ParserTest|NewParserTest $parserTest
 	 * @return bool
+	 * @throws MWException
 	 */
 	public function unleash( &$parserTest ) {
 		if ( !( $parserTest instanceof ParserTest || $parserTest instanceof NewParserTest )	) {
@@ -805,7 +807,7 @@ class TidySupport {
 		global $wgTidyBin;
 
 		$this->internalTidy = extension_loaded( 'tidy' ) &&
-			class_exists( 'tidy' );
+			class_exists( 'tidy' ) && !wfIsHHVM();
 
 		$this->externalTidy = is_executable( $wgTidyBin ) ||
 			Installer::locateExecutableInDefaultPaths( array( $wgTidyBin ) )