Merge commit 'f6d65'

# Conflicts:
#	skins/ArchLinux/ArchLinux.php

1 files changed, 3 insertions, 19 deletions

diff --git a/tests/phpunit/includes/api/ApiTestCaseUpload.php b/tests/phpunit/includes/api/ApiTestCaseUpload.php
index 7e513394..87f794c1 100644
--- a/tests/phpunit/includes/api/ApiTestCaseUpload.php
+++ b/tests/phpunit/includes/api/ApiTestCaseUpload.php
@@ -1,9 +1,8 @@
 <?php
 
 /**
- *  * Abstract class to support upload tests
+ * Abstract class to support upload tests
  */
-
 abstract class ApiTestCaseUpload extends ApiTestCase {
 	/**
 	 * Fixture -- run before every test
@@ -21,12 +20,6 @@ abstract class ApiTestCaseUpload extends ApiTestCase {
 		$this->clearFakeUploads();
 	}
 
-	protected function tearDown() {
-		$this->clearTempUpload();
-
-		parent::tearDown();
-	}
-
 	/**
 	 * Helper function -- remove files and associated articles by Title
 	 *
@@ -105,7 +98,7 @@ abstract class ApiTestCaseUpload extends ApiTestCase {
 	 * @return bool
 	 */
 	function fakeUploadFile( $fieldName, $fileName, $type, $filePath ) {
-		$tmpName = tempnam( wfTempDir(), "" );
+		$tmpName = $this->getNewTempFile();
 		if ( !file_exists( $filePath ) ) {
 			throw new Exception( "$filePath doesn't exist!" );
 		}
@@ -132,7 +125,7 @@ abstract class ApiTestCaseUpload extends ApiTestCase {
 	}
 
 	function fakeUploadChunk( $fieldName, $fileName, $type, & $chunkData ) {
-		$tmpName = tempnam( wfTempDir(), "" );
+		$tmpName = $this->getNewTempFile();
 		// copy the chunk data to temp location:
 		if ( !file_put_contents( $tmpName, $chunkData ) ) {
 			throw new Exception( "couldn't copy chunk data to $tmpName" );
@@ -153,15 +146,6 @@ abstract class ApiTestCaseUpload extends ApiTestCase {
 		);
 	}
 
-	function clearTempUpload() {
-		if ( isset( $_FILES['file']['tmp_name'] ) ) {
-			$tmp = $_FILES['file']['tmp_name'];
-			if ( file_exists( $tmp ) ) {
-				unlink( $tmp );
-			}
-		}
-	}
-
 	/**
 	 * Remove traces of previous fake uploads
 	 */