Addshore has uploaded a new change for review.
https://gerrit.wikimedia.org/r/78956
Change subject: Potential fix for travis
......................................................................
Potential fix for travis
Change-Id: I70062e2740058b62591334a8bdddc468d6a73527
---
M repo/tests/phpunit/includes/api/LangAttributeTestCase.php
M repo/tests/phpunit/includes/api/SetDescriptionTest.php
M repo/tests/phpunit/includes/api/SetLabelTest.php
3 files changed, 20 insertions(+), 10 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/56/78956/2
diff --git a/repo/tests/phpunit/includes/api/LangAttributeTestCase.php
b/repo/tests/phpunit/includes/api/LangAttributeTestCase.php
index 1f0e849..91240df 100644
--- a/repo/tests/phpunit/includes/api/LangAttributeTestCase.php
+++ b/repo/tests/phpunit/includes/api/LangAttributeTestCase.php
@@ -55,15 +55,9 @@
protected static $testAction;
protected static $testId;
- private static $hasSetup;
public function setUp() {
parent::setUp();
-
- if( !isset( self::$hasSetup ) ){
- $this->initTestEntities( array( 'Empty') );
- }
- self::$hasSetup = true;
}
public static function provideData() {
diff --git a/repo/tests/phpunit/includes/api/SetDescriptionTest.php
b/repo/tests/phpunit/includes/api/SetDescriptionTest.php
index 855e725..8783eaf 100644
--- a/repo/tests/phpunit/includes/api/SetDescriptionTest.php
+++ b/repo/tests/phpunit/includes/api/SetDescriptionTest.php
@@ -54,22 +54,30 @@
*/
class SetDescriptionTest extends LangAttributeTestCase {
+ private static $hasSetup;
+
public function setUp() {
- self::$testAction = 'wbsetdescription';
parent::setUp();
+
+ self::$testAction = 'wbsetdescription';
+
+ if( !isset( self::$hasSetup ) ){
+ $this->initTestEntities( array( 'Empty' ) );
+ }
+ self::$hasSetup = true;
}
/**
* @dataProvider provideData
*/
- public function testSetLabel( $params, $expected ){
+ public function testSetDescription( $params, $expected ){
self::doTestSetLangAttribute( 'descriptions' ,$params,
$expected );
}
/**
* @dataProvider provideExceptionData
*/
- public function testSetLabelExceptions( $params, $expected ){
+ public function testSetDescriptionExceptions( $params, $expected ){
self::doTestSetLangAttributeExceptions( $params, $expected );
}
}
diff --git a/repo/tests/phpunit/includes/api/SetLabelTest.php
b/repo/tests/phpunit/includes/api/SetLabelTest.php
index d18488a..0cbe02a 100644
--- a/repo/tests/phpunit/includes/api/SetLabelTest.php
+++ b/repo/tests/phpunit/includes/api/SetLabelTest.php
@@ -54,9 +54,17 @@
*/
class SetLabelTest extends LangAttributeTestCase {
+ private static $hasSetup;
+
public function setUp() {
- self::$testAction = 'wbsetlabel';
parent::setUp();
+
+ self::$testAction = 'wbsetlabel';
+
+ if( !isset( self::$hasSetup ) ){
+ $this->initTestEntities( array( 'Empty' ) );
+ }
+ self::$hasSetup = true;
}
/**
--
To view, visit https://gerrit.wikimedia.org/r/78956
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I70062e2740058b62591334a8bdddc468d6a73527
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Addshore <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
