dépôts
/
lhc
/
web
/
wiklou.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "API: Avoid unstubbing User for language pref when not needed"
[lhc/web/wiklou.git]
/
tests
/
testHelpers.inc
diff --git
a/tests/testHelpers.inc
b/tests/testHelpers.inc
index
62dccbf
..
6d3ac2f
100644
(file)
--- 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.
$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(
}
$this->test = array(
@@
-558,7
+558,7
@@
class TestFileIterator implements Iterator {
$line = trim( $line );
if ( $line ) {
$line = trim( $line );
if ( $line ) {
- $delayedParserTest->requireTransparentHook( $line );
+ $
this->
delayedParserTest->requireTransparentHook( $line );
}
}
}
}
@@
-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
* @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 ) ) {
*/
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
* 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 ) ) {
*/
public function unleash( &$parserTest ) {
if ( !( $parserTest instanceof ParserTest || $parserTest instanceof NewParserTest ) ) {
@@
-805,7
+807,7
@@
class TidySupport {
global $wgTidyBin;
$this->internalTidy = extension_loaded( 'tidy' ) &&
global $wgTidyBin;
$this->internalTidy = extension_loaded( 'tidy' ) &&
- class_exists( 'tidy' );
+ class_exists( 'tidy' )
&& !wfIsHHVM()
;
$this->externalTidy = is_executable( $wgTidyBin ) ||
Installer::locateExecutableInDefaultPaths( array( $wgTidyBin ) )
$this->externalTidy = is_executable( $wgTidyBin ) ||
Installer::locateExecutableInDefaultPaths( array( $wgTidyBin ) )