dépôts
/
lhc
/
web
/
wiklou.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
(from parent 1:
9a6b2a4
)
Merge "Don’t write to stderr when testing"
author
jenkins-bot
<jenkins-bot@gerrit.wikimedia.org>
Fri, 26 Jan 2018 14:12:46 +0000
(14:12 +0000)
committer
Gerrit Code Review
<gerrit@wikimedia.org>
Fri, 26 Jan 2018 14:12:46 +0000
(14:12 +0000)
maintenance/Maintenance.php
patch
|
blob
|
history
diff --git
a/maintenance/Maintenance.php
b/maintenance/Maintenance.php
index
86336cf
..
527e6cb
100644
(file)
--- a/
maintenance/Maintenance.php
+++ b/
maintenance/Maintenance.php
@@
-414,7
+414,10
@@
abstract class Maintenance {
$this->fatalError( $err, intval( $die ) );
}
$this->outputChanneled( false );
- if ( PHP_SAPI == 'cli' || PHP_SAPI == 'phpdbg' ) {
+ if (
+ ( PHP_SAPI == 'cli' || PHP_SAPI == 'phpdbg' ) &&
+ !defined( 'MW_PHPUNIT_TEST' )
+ ) {
fwrite( STDERR, $err . "\n" );
} else {
print $err;