1 files changed, 24 insertions, 41 deletions

diff --git a/tests/phpunit/includes/api/ApiUploadTest.php b/tests/phpunit/includes/api/ApiUploadTest.php
index 8ea761f8..f74fc354 100644
--- a/tests/phpunit/includes/api/ApiUploadTest.php
+++ b/tests/phpunit/includes/api/ApiUploadTest.php
@@ -1,31 +1,24 @@
 <?php
 /**
- * @group API
- * @group Database
- * @group medium
- */
-
-/**
  * n.b. Ensure that you can write to the images/ directory as the
  * user that will run tests.
- */
-
-// Note for reviewers: this intentionally duplicates functionality already in
-// "ApiSetup" and so on. This framework works better IMO and has less
-// strangeness (such as test cases inheriting from "ApiSetup"...) (and in the
-// case of the other Upload tests, this flat out just actually works... )
-
-// @todo Port the other Upload tests, and other API tests to this framework
-
-require_once 'ApiTestCaseUpload.php';
-
-/**
- * @group Database
- * @group Broken
- * Broken test, reports false errors from time to time.
+ *
+ * Note for reviewers: this intentionally duplicates functionality already in
+ * "ApiSetup" and so on. This framework works better IMO and has less
+ * strangeness (such as test cases inheriting from "ApiSetup"...) (and in the
+ * case of the other Upload tests, this flat out just actually works... )
+ *
+ * @todo Port the other Upload tests, and other API tests to this framework
+ *
+ * @todo Broken test, reports false errors from time to time.
  * See https://bugzilla.wikimedia.org/26169
  *
- * This is pretty sucky... needs to be prettified.
+ * @todo This is pretty sucky... needs to be prettified.
+ *
+ * @group API
+ * @group Database
+ * @group medium
+ * @group Broken
  */
 class ApiUploadTest extends ApiTestCaseUpload {
 	/**
@@ -105,7 +98,7 @@ class ApiUploadTest extends ApiTestCaseUpload {
 
 		try {
 			$randomImageGenerator = new RandomImageGenerator();
-			$filePaths = $randomImageGenerator->writeImages( 1, $extension, wfTempDir() );
+			$filePaths = $randomImageGenerator->writeImages( 1, $extension, $this->getNewTempDirectory() );
 		} catch ( Exception $e ) {
 			$this->markTestIncomplete( $e->getMessage() );
 		}
@@ -145,7 +138,6 @@ class ApiUploadTest extends ApiTestCaseUpload {
 
 		// clean up
 		$this->deleteFileByFilename( $fileName );
-		unlink( $filePath );
 	}
 
 	/**
@@ -154,7 +146,7 @@ class ApiUploadTest extends ApiTestCaseUpload {
 	public function testUploadZeroLength( $session ) {
 		$mimeType = 'image/png';
 
-		$filePath = tempnam( wfTempDir(), "" );
+		$filePath = $this->getNewTempFile();
 		$fileName = "apiTestUploadZeroLength.png";
 
 		$this->deleteFileByFileName( $fileName );
@@ -182,7 +174,6 @@ class ApiUploadTest extends ApiTestCaseUpload {
 
 		// clean up
 		$this->deleteFileByFilename( $fileName );
-		unlink( $filePath );
 	}
 
 	/**
@@ -194,7 +185,7 @@ class ApiUploadTest extends ApiTestCaseUpload {
 
 		try {
 			$randomImageGenerator = new RandomImageGenerator();
-			$filePaths = $randomImageGenerator->writeImages( 2, $extension, wfTempDir() );
+			$filePaths = $randomImageGenerator->writeImages( 2, $extension, $this->getNewTempDirectory() );
 		} catch ( Exception $e ) {
 			$this->markTestIncomplete( $e->getMessage() );
 		}
@@ -253,8 +244,6 @@ class ApiUploadTest extends ApiTestCaseUpload {
 
 		// clean up
 		$this->deleteFileByFilename( $fileName );
-		unlink( $filePaths[0] );
-		unlink( $filePaths[1] );
 	}
 
 	/**
@@ -266,7 +255,7 @@ class ApiUploadTest extends ApiTestCaseUpload {
 
 		try {
 			$randomImageGenerator = new RandomImageGenerator();
-			$filePaths = $randomImageGenerator->writeImages( 1, $extension, wfTempDir() );
+			$filePaths = $randomImageGenerator->writeImages( 1, $extension, $this->getNewTempDirectory() );
 		} catch ( Exception $e ) {
 			$this->markTestIncomplete( $e->getMessage() );
 		}
@@ -335,7 +324,6 @@ class ApiUploadTest extends ApiTestCaseUpload {
 		// clean up
 		$this->deleteFileByFilename( $fileNames[0] );
 		$this->deleteFileByFilename( $fileNames[1] );
-		unlink( $filePaths[0] );
 	}
 
 	/**
@@ -351,7 +339,7 @@ class ApiUploadTest extends ApiTestCaseUpload {
 
 		try {
 			$randomImageGenerator = new RandomImageGenerator();
-			$filePaths = $randomImageGenerator->writeImages( 1, $extension, wfTempDir() );
+			$filePaths = $randomImageGenerator->writeImages( 1, $extension, $this->getNewTempDirectory() );
 		} catch ( Exception $e ) {
 			$this->markTestIncomplete( $e->getMessage() );
 		}
@@ -419,7 +407,6 @@ class ApiUploadTest extends ApiTestCaseUpload {
 
 		// clean up
 		$this->deleteFileByFilename( $fileName );
-		unlink( $filePath );
 	}
 
 	/**
@@ -433,16 +420,14 @@ class ApiUploadTest extends ApiTestCaseUpload {
 
 		$chunkSize = 1048576;
 		// Download a large image file
-		// ( using RandomImageGenerator for large files is not stable )
+		// (using RandomImageGenerator for large files is not stable)
+		// @todo Don't download files from wikimedia.org
 		$mimeType = 'image/jpeg';
 		$url = 'http://upload.wikimedia.org/wikipedia/commons/'
 			. 'e/ed/Oberaargletscher_from_Oberaar%2C_2010_07.JPG';
-		$filePath = wfTempDir() . '/Oberaargletscher_from_Oberaar.jpg';
+		$filePath = $this->getNewTempDirectory() . '/Oberaargletscher_from_Oberaar.jpg';
 		try {
-			// Only download if the file is not avaliable in the temp location:
-			if ( !is_file( $filePath ) ) {
-				copy( $url, $filePath );
-			}
+			copy( $url, $filePath );
 		} catch ( Exception $e ) {
 			$this->markTestIncomplete( $e->getMessage() );
 		}
@@ -566,7 +551,5 @@ class ApiUploadTest extends ApiTestCaseUpload {
 
 		// clean up
 		$this->deleteFileByFilename( $fileName );
-		// don't remove downloaded temporary file for fast subquent tests.
-		//unlink( $filePath );
 	}
 }