r106765 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r106764‎ | r106765 | r106766 >
Date:07:55, 20 December 2011
Author:aaron
Status:ok (Comments)
Tags:
Comment:
Set deleted zone container in UploadFromUrlTestSuite
Modified paths:
  • /trunk/phase3/tests/phpunit/suites/UploadFromUrlTestSuite.php (modified) (history)

Diff [purge]

Index: trunk/phase3/tests/phpunit/suites/UploadFromUrlTestSuite.php
@@ -42,7 +42,9 @@
4343 'url' => 'http://example.com/images',
4444 'hashLevels' => 2,
4545 'transformVia404' => false,
46 - 'backend' => $backend
 46+ 'backend' => $backend,
 47+ 'zones' => array( 'deleted' => array(
 48+ 'container' => 'images-deleted', 'directory' => '' ) )
4749 );
4850 $wgNamespaceProtection[NS_MEDIAWIKI] = 'editinterface';
4951 $wgNamespaceAliases['Image'] = NS_FILE;
@@ -69,6 +71,7 @@
7072
7173 }
7274
 75+ // @FIXME: restore globals?
7376 public function tearDown() {
7477 $this->teardownUploadDir( $this->uploadDir );
7578 }

Comments

#Comment by Aaron Schulz (talk | contribs)   08:56, 20 December 2011

This doesn't fix the root problem of globals not being restored on teardown, it just stops tests failures.

#Comment by Tim Starling (talk | contribs)   11:20, 22 December 2011

Was this the reason for the Jenkins failure? If so, well done isolating it.

Status & tagging log