From: Platonides <platonides@users.mediawiki.org>
Date: Tue, 21 Jun 2011 15:06:59 +0000 (+0000)
Subject: Revert r90483, if tesla has problems, it should get proper permissions to the affecte... 
X-Git-Tag: 1.31.0-rc.0~29377
X-Git-Url: https://git.cyclocoop.org/%242?a=commitdiff_plain;h=f5dec1eefaf593fb424178ce6f4d9a979c862ee0;p=lhc%2Fweb%2Fwiklou.git

Revert r90483, if tesla has problems, it should get proper permissions to the affected folders (or change the test to use a temp folder)
The test was not consistent, since first time it would use the svn file, which renames it... and on next run it would be missing!
I added the '.' to the unlik() step so it properly cleans up. Opened bug 29512 for the strange UploadStash behavior.

However, although it passes now most of the times, it sometimes fails with the strange exception:
Only variables should be passed by reference

phase3/includes/upload/UploadStash.php:143
phase3/tests/phpunit/includes/upload/UploadStashTest.php:22
phase3/tests/phpunit/MediaWikiTestCase.php:64
phase3/tests/phpunit/MediaWikiPHPUnitCommand.php:20
phase3/tests/phpunit/phpunit.php:60
---

diff --git a/tests/phpunit/includes/upload/UploadStashTest.php b/tests/phpunit/includes/upload/UploadStashTest.php
index aabe7501d8..3f7863dced 100644
--- a/tests/phpunit/includes/upload/UploadStashTest.php
+++ b/tests/phpunit/includes/upload/UploadStashTest.php
@@ -11,7 +11,7 @@ class UploadStashTest extends MediaWikiTestCase {
 		
 		// Setup a file for bug 29408
 		$this->bug29408File = dirname( __FILE__ ) . '/bug29408';
-		// file_put_contents( $this->bug29408File, "\x00" );		
+		file_put_contents( $this->bug29408File, "\x00" );		
 	}
 	
 	public function testBug29408() {
@@ -28,5 +28,8 @@ class UploadStashTest extends MediaWikiTestCase {
 	
 	public function tearDown() {
 		parent::tearDown();
+		
+		unlink( $this->bug29408File . "." );
+		
 	}
-}
\ No newline at end of file
+}
diff --git a/tests/phpunit/includes/upload/bug29408 b/tests/phpunit/includes/upload/bug29408
deleted file mode 100644
index f76dd238ad..0000000000
Binary files a/tests/phpunit/includes/upload/bug29408 and /dev/null differ