Seb35 has uploaded a new change for review. https://gerrit.wikimedia.org/r/324693
Change subject: Improve testing ...................................................................... Improve testing * Instead of a hacky 'sed -i' in composer.json, dynamically declare the class MediaWikiTestCase if missing (when PHPUnit is called directly). * Check if phpdbg is installed, else use php Bug: T151879 Change-Id: I17604c11e773f74f2c8b7ccb6aa7919cb729d552 --- M composer.json M tests/phpunit/MediaWikiFarmTestCase.php 2 files changed, 7 insertions(+), 10 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MediaWikiFarm refs/changes/93/324693/1 diff --git a/composer.json b/composer.json index 7a94498..ad08cc8 100644 --- a/composer.json +++ b/composer.json @@ -27,16 +27,8 @@ "lint": "parallel-lint --exclude vendor .", "phpcs": "phpcs -p -s", "phpdoc": "phpdoc -d bin,src -t ./docs/code", - "phpunit": [ - "sed -i 's/extends MediaWikiTestCase/extends PHPUnit_Framework_TestCase/' tests/phpunit/MediaWikiFarmTestCase.php", - "phpdbg -qrr `which phpunit` --strict-coverage", - "sed -i 's/extends PHPUnit_Framework_TestCase/extends MediaWikiTestCase/' tests/phpunit/MediaWikiFarmTestCase.php" - ], - "unit": [ - "sed -i 's/extends MediaWikiTestCase/extends PHPUnit_Framework_TestCase/' tests/phpunit/MediaWikiFarmTestCase.php", - "phpunit --no-coverage", - "sed -i 's/extends PHPUnit_Framework_TestCase/extends MediaWikiTestCase/' tests/phpunit/MediaWikiFarmTestCase.php" - ], + "phpunit": "which phpdbg && phpdbg -qrr `which phpunit` --strict-coverage || phpunit --strict-coverage", + "unit": "phpunit --no-coverage", "test": [ "composer lint", "composer unit", diff --git a/tests/phpunit/MediaWikiFarmTestCase.php b/tests/phpunit/MediaWikiFarmTestCase.php index 9b5e037..832dd72 100644 --- a/tests/phpunit/MediaWikiFarmTestCase.php +++ b/tests/phpunit/MediaWikiFarmTestCase.php @@ -9,6 +9,11 @@ require_once dirname( dirname( dirname( __FILE__ ) ) ) . '/src/AbstractMediaWikiFarmScript.php'; +# When executing PHPUnit alone, this class does not exist +if( !class_exists( 'MediaWikiTestCase' ) ) { + + class MediaWikiTestCase extends PHPUnit_Framework_TestCase {} +} abstract class MediaWikiFarmTestCase extends MediaWikiTestCase { -- To view, visit https://gerrit.wikimedia.org/r/324693 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I17604c11e773f74f2c8b7ccb6aa7919cb729d552 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/MediaWikiFarm Gerrit-Branch: master Gerrit-Owner: Seb35 <seb35wikipe...@gmail.com> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits