From: Sam Reed <reedy@users.mediawiki.org>
Date: Sun, 3 Oct 2010 22:51:01 +0000 (+0000)
Subject: Nuke returns from end of tests
X-Git-Tag: 1.31.0-rc.0~34632
X-Git-Url: http://git.cyclocoop.org/url?a=commitdiff_plain;h=b9a7cef88a73928417b0b8667e8db2c895099e02;p=lhc%2Fweb%2Fwiklou.git

Nuke returns from end of tests
---

diff --git a/maintenance/tests/phpunit/includes/api/ApiWatchTest.php b/maintenance/tests/phpunit/includes/api/ApiWatchTest.php
index bf1d010c23..58d1397971 100644
--- a/maintenance/tests/phpunit/includes/api/ApiWatchTest.php
+++ b/maintenance/tests/phpunit/includes/api/ApiWatchTest.php
@@ -29,8 +29,6 @@ class ApiWatchTest extends ApiTestSetup {
 		$this->assertArrayHasKey( "result", $data[0]['login'] );
 		$this->assertEquals( "Success", $data[0]['login']['result'] );
 		$this->assertArrayHasKey( 'lgtoken', $data[0]['login'] );
-
-		return $data;
 	}
 
 	function testGetToken() {
@@ -53,8 +51,6 @@ class ApiWatchTest extends ApiTestSetup {
 		$this->assertArrayHasKey( 'blocktoken', $data[0]['query']['pages'][$key] );
 		$this->assertArrayHasKey( 'unblocktoken', $data[0]['query']['pages'][$key] );
 		$this->assertArrayHasKey( 'protecttoken', $data[0]['query']['pages'][$key] );
-
-		return $data;
 	}
 
 	/**
@@ -74,11 +70,8 @@ class ApiWatchTest extends ApiTestSetup {
 		$this->assertArrayHasKey( 'edit', $data[0] );
 		$this->assertArrayHasKey( 'result', $data[0]['edit'] );
 		$this->assertEquals( 'Success', $data[0]['edit']['result'] );
-
-		return $data;
 	}
 
-
 	/**
 	 * @depends testWatchEdit
 	 */
@@ -103,8 +96,6 @@ class ApiWatchTest extends ApiTestSetup {
 		$this->assertArrayHasKey( 'query', $data[0] );
 		$this->assertArrayHasKey( 'watchlist', $data[0]['query'] );
 		$this->assertEquals( 0, count( $data[0]['query']['watchlist'] ) );
-
-		return $data;
 	}
 
 	/**
@@ -147,8 +138,6 @@ class ApiWatchTest extends ApiTestSetup {
 		$this->assertArrayHasKey( 'revisions', $data[0]['query']['pages'][$key] );
 		$this->assertArrayHasKey( 0, $data[0]['query']['pages'][$key]['revisions'] );
 		$this->assertArrayHasKey( 'rollbacktoken', $data[0]['query']['pages'][$key]['revisions'][0] );
-
-		return $data;
 	}
 
 	/**