aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad Jorsch <bjorsch@wikimedia.org>2013-01-18 14:02:28 -0500
committerBrad Jorsch <bjorsch@wikimedia.org>2013-01-18 14:07:49 -0500
commit252ae6268bb33360fa2f918a264364ef3d52323c (patch)
tree5b6b558b224e94cf5dd472c71bbfbc2d5888eeda
parent258929f57248879e30749ff6007e545f36623a0a (diff)
downloadmediawikicore-252ae6268bb33360fa2f918a264364ef3d52323c.tar.gz
mediawikicore-252ae6268bb33360fa2f918a264364ef3d52323c.zip
(bug 43762) Mark slow unit test as @group medium
All tests based on APITestCase can be slow. I've also seen more than one Jenkins failure due to GlobalTest::testMerge timing out. Also, added a meta-test on APITestCase to make sure that all its subclasses are marked with @group medium or @group large, to prevent new tests from re-causing the bug. Change-Id: I48630736a3d06574876fd1fa3d90899cfbc48012
-rw-r--r--tests/phpunit/includes/GlobalFunctions/GlobalTest.php1
-rw-r--r--tests/phpunit/includes/api/ApiAccountCreationTest.php1
-rw-r--r--tests/phpunit/includes/api/ApiBlockTest.php1
-rw-r--r--tests/phpunit/includes/api/ApiParseTest.php1
-rw-r--r--tests/phpunit/includes/api/ApiPurgeTest.php1
-rw-r--r--tests/phpunit/includes/api/ApiQueryRevisionsTest.php1
-rw-r--r--tests/phpunit/includes/api/ApiQueryTest.php1
-rw-r--r--tests/phpunit/includes/api/ApiTest.php1
-rw-r--r--tests/phpunit/includes/api/ApiTestCase.php11
-rw-r--r--tests/phpunit/includes/api/ApiWatchTest.php1
-rw-r--r--tests/phpunit/includes/api/format/ApiFormatPhpTest.php1
11 files changed, 21 insertions, 0 deletions
diff --git a/tests/phpunit/includes/GlobalFunctions/GlobalTest.php b/tests/phpunit/includes/GlobalFunctions/GlobalTest.php
index 0dc18a2919ba..1a02cb82bbd3 100644
--- a/tests/phpunit/includes/GlobalFunctions/GlobalTest.php
+++ b/tests/phpunit/includes/GlobalFunctions/GlobalTest.php
@@ -496,6 +496,7 @@ class GlobalTest extends MediaWikiTestCase {
* @param String $expectedText: Text after merge has been completed
*
* @dataProvider provideMerge()
+ * @group medium
*/
public function testMerge( $old, $mine, $yours, $expectedMergeResult, $expectedText ) {
$this->checkHasDiff3();
diff --git a/tests/phpunit/includes/api/ApiAccountCreationTest.php b/tests/phpunit/includes/api/ApiAccountCreationTest.php
index a764e9ddd980..80f41e2115c4 100644
--- a/tests/phpunit/includes/api/ApiAccountCreationTest.php
+++ b/tests/phpunit/includes/api/ApiAccountCreationTest.php
@@ -3,6 +3,7 @@
/**
* @group Database
* @group API
+ * @group medium
*/
class ApiCreateAccountTest extends ApiTestCase {
function setUp() {
diff --git a/tests/phpunit/includes/api/ApiBlockTest.php b/tests/phpunit/includes/api/ApiBlockTest.php
index 52f1d28dd35a..dd4d5982419e 100644
--- a/tests/phpunit/includes/api/ApiBlockTest.php
+++ b/tests/phpunit/includes/api/ApiBlockTest.php
@@ -3,6 +3,7 @@
/**
* @group API
* @group Database
+ * @group medium
*/
class ApiBlockTest extends ApiTestCase {
diff --git a/tests/phpunit/includes/api/ApiParseTest.php b/tests/phpunit/includes/api/ApiParseTest.php
index b5dabf0c6681..93ff24ad3fd4 100644
--- a/tests/phpunit/includes/api/ApiParseTest.php
+++ b/tests/phpunit/includes/api/ApiParseTest.php
@@ -3,6 +3,7 @@
/**
* @group API
* @group Database
+ * @group medium
*/
class ApiParseTest extends ApiTestCase {
diff --git a/tests/phpunit/includes/api/ApiPurgeTest.php b/tests/phpunit/includes/api/ApiPurgeTest.php
index d9037149248d..3ab77fd21cdc 100644
--- a/tests/phpunit/includes/api/ApiPurgeTest.php
+++ b/tests/phpunit/includes/api/ApiPurgeTest.php
@@ -3,6 +3,7 @@
/**
* @group API
* @group Database
+ * @group medium
*/
class ApiPurgeTest extends ApiTestCase {
diff --git a/tests/phpunit/includes/api/ApiQueryRevisionsTest.php b/tests/phpunit/includes/api/ApiQueryRevisionsTest.php
index 28dcb97668e4..19da81c73744 100644
--- a/tests/phpunit/includes/api/ApiQueryRevisionsTest.php
+++ b/tests/phpunit/includes/api/ApiQueryRevisionsTest.php
@@ -3,6 +3,7 @@
/**
* @group API
* @group Database
+ * @group medium
*/
class ApiQueryRevisionsTest extends ApiTestCase {
diff --git a/tests/phpunit/includes/api/ApiQueryTest.php b/tests/phpunit/includes/api/ApiQueryTest.php
index dbf02f7d8fc9..1b1886e17d63 100644
--- a/tests/phpunit/includes/api/ApiQueryTest.php
+++ b/tests/phpunit/includes/api/ApiQueryTest.php
@@ -3,6 +3,7 @@
/**
* @group API
* @group Database
+ * @group medium
*/
class ApiQueryTest extends ApiTestCase {
diff --git a/tests/phpunit/includes/api/ApiTest.php b/tests/phpunit/includes/api/ApiTest.php
index a1b941dd4e48..2f2f5f9fc80d 100644
--- a/tests/phpunit/includes/api/ApiTest.php
+++ b/tests/phpunit/includes/api/ApiTest.php
@@ -3,6 +3,7 @@
/**
* @group API
* @group Database
+ * @group medium
*/
class ApiTest extends ApiTestCase {
diff --git a/tests/phpunit/includes/api/ApiTestCase.php b/tests/phpunit/includes/api/ApiTestCase.php
index 7e054a466396..fcd581abcc59 100644
--- a/tests/phpunit/includes/api/ApiTestCase.php
+++ b/tests/phpunit/includes/api/ApiTestCase.php
@@ -147,6 +147,17 @@ abstract class ApiTestCase extends MediaWikiLangTestCase {
'prop' => 'info' ), $session, false, $user->user );
return $data;
}
+
+ public function testApiTestGroup() {
+ $groups = PHPUnit_Util_Test::getGroups( get_class( $this ) );
+ $constraint = PHPUnit_Framework_Assert::logicalOr(
+ $this->contains( 'medium' ),
+ $this->contains( 'large' )
+ );
+ $this->assertThat( $groups, $constraint,
+ 'ApiTestCase::setUp can be slow, tests must be "medium" or "large"'
+ );
+ }
}
class UserWrapper {
diff --git a/tests/phpunit/includes/api/ApiWatchTest.php b/tests/phpunit/includes/api/ApiWatchTest.php
index b7ae29222fd2..4fecec049833 100644
--- a/tests/phpunit/includes/api/ApiWatchTest.php
+++ b/tests/phpunit/includes/api/ApiWatchTest.php
@@ -3,6 +3,7 @@
/**
* @group API
* @group Database
+ * @group medium
* @todo This test suite is severly broken and need a full review
*/
class ApiWatchTest extends ApiTestCase {
diff --git a/tests/phpunit/includes/api/format/ApiFormatPhpTest.php b/tests/phpunit/includes/api/format/ApiFormatPhpTest.php
index 8209f5910be0..d34e7998eec6 100644
--- a/tests/phpunit/includes/api/format/ApiFormatPhpTest.php
+++ b/tests/phpunit/includes/api/format/ApiFormatPhpTest.php
@@ -3,6 +3,7 @@
/**
* @group API
* @group Database
+ * @group medium
*/
class ApiFormatPhpTest extends ApiFormatTestBase {