Mailing List Archive

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/404677 )

Change subject: Take advantage of MaintenanceBaseTestCase
......................................................................


Take advantage of MaintenanceBaseTestCase

Change-Id: I9581adc5141873da201ee5b86914e7119179ce81
---
M tests/phpunit/maintenance/PopulateDatabaseTest.php
M tests/phpunit/maintenance/PurgeScoreCacheTest.php
2 files changed, 24 insertions(+), 18 deletions(-)

Approvals:
Ladsgroup: Looks good to me, approved
jenkins-bot: Verified



diff --git a/tests/phpunit/maintenance/PopulateDatabaseTest.php b/tests/phpunit/maintenance/PopulateDatabaseTest.php
index 402f331..d7d5f81 100644
--- a/tests/phpunit/maintenance/PopulateDatabaseTest.php
+++ b/tests/phpunit/maintenance/PopulateDatabaseTest.php
@@ -2,6 +2,7 @@

namespace ORES\Tests\Maintenance;

+use MediaWiki\Tests\Maintenance\MaintenanceBaseTestCase;
use ORES\Maintenance\PopulateDatabase;

use ORES\Tests\MockOresServiceBuilder;
@@ -12,7 +13,11 @@
* @group Database
* @covers ORES\Maintenance\PopulateDatabase
*/
-class PopulateDatabaseTest extends \MediaWikiTestCase {
+class PopulateDatabaseTest extends MaintenanceBaseTestCase {
+
+ public function getMaintenanceClass() {
+ return PopulateDatabase::class;
+ }

public function setUp() {
parent::setUp();
@@ -21,8 +26,6 @@
'ores_model',
'recentchanges',
];
-
- $this->maintenance = new PopulateDatabase();

TestHelper::clearOresTables();
TestHelper::insertModelData();
@@ -158,9 +161,6 @@
foreach ( $oresContents as $revId => $scores ) {
TestHelper::insertOresData( $revId, $scores );
}
-
- // FIXME: Write a base maintenance test case that suppresses output.
- $argv = array_merge( $argv, [ '--quiet' ] );

$this->maintenance->loadWithArgv( $argv );
$this->maintenance->execute();
diff --git a/tests/phpunit/maintenance/PurgeScoreCacheTest.php b/tests/phpunit/maintenance/PurgeScoreCacheTest.php
index 3dafa78..478e2ed 100644
--- a/tests/phpunit/maintenance/PurgeScoreCacheTest.php
+++ b/tests/phpunit/maintenance/PurgeScoreCacheTest.php
@@ -3,6 +3,7 @@
namespace ORES\Tests\Maintenance;

use MediaWiki\MediaWikiServices;
+use MediaWiki\Tests\Maintenance\MaintenanceBaseTestCase;

use ORES\Maintenance\PurgeScoreCache;

@@ -25,7 +26,11 @@
* @group Database
* @covers ORES\Maintenance\PurgeScoreCache
*/
-class PurgeScoreCacheTest extends \MediaWikiTestCase {
+class PurgeScoreCacheTest extends MaintenanceBaseTestCase {
+
+ public function getMaintenanceClass() {
+ return PurgeScoreCache::class;
+ }

public function setUp() {
parent::setUp();
@@ -33,8 +38,6 @@
'ores_classification',
'ores_model',
];
-
- $this->maintenance = new PurgeScoreCache();

TestHelper::clearOresTables();
TestHelper::insertModelData();
@@ -45,9 +48,6 @@

public function testPurgeScoreCache_emptyDb() {
TestHelper::clearOresTables();
-
- // FIXME: Shouldn't be necessary once we capture output.
- $this->maintenance->loadWithArgv( [ '--quiet' ] );

$this->maintenance->execute();

@@ -62,7 +62,7 @@
'damaging' => 0.1,
] );

- $this->maintenance->loadWithArgv( [ '--quiet', '--model', 'not_a_thing' ] );
+ $this->maintenance->loadWithArgv( [ '--model', 'not_a_thing' ] );

$this->maintenance->execute();

@@ -79,6 +79,8 @@
'oresc_probability' => '0.100',
'oresc_model' => (string)TestHelper::DAMAGING,
] ], iterator_to_array( $remainingScores, false ) );
+
+ $this->expectOutputRegex( '/skipping \'not_a_thing\' model/' );
}

public function testPurgeScoreCache_all() {
@@ -88,7 +90,7 @@
'damaging' => 0.1,
] );

- $this->maintenance->loadWithArgv( [ '--quiet', '--all' ] );
+ $this->maintenance->loadWithArgv( [ '--all' ] );

$this->maintenance->execute();

@@ -100,6 +102,10 @@
);

$this->assertEquals( [], iterator_to_array( $remainingScores, false ) );
+
+ $pattern = '/skipping \'reverted\'.+'
+ . 'purging scores from all model versions from \'damaging\'/s';
+ $this->expectOutputRegex( $pattern );
}

public function testPurgeScoreCache_oldModels() {
@@ -108,8 +114,6 @@
TestHelper::DAMAGING_OLD => 0.2,
'damaging' => 0.1,
] );
-
- $this->maintenance->loadWithArgv( [ '--quiet' ] );

$this->maintenance->execute();

@@ -126,6 +130,8 @@
'oresc_probability' => '0.100',
'oresc_model' => (string)TestHelper::DAMAGING,
] ], iterator_to_array( $remainingScores, false ) );
+
+ $this->expectOutputRegex( '/purging scores from old model versions/' );
}

public function testPurgeScoreCache_nonRecent() {
@@ -145,7 +151,7 @@
'rc_user_text' => 'TestUser',
], __METHOD__ );

- $this->maintenance->loadWithArgv( [ '--quiet', '--old' ] );
+ $this->maintenance->loadWithArgv( [ '--old' ] );

$this->maintenance->execute();

@@ -171,7 +177,7 @@
'reverted' => 0.3,
] );

- $this->maintenance->loadWithArgv( [ '--quiet', '--model', 'reverted', '--all' ] );
+ $this->maintenance->loadWithArgv( [ '--model', 'reverted', '--all' ] );

$this->maintenance->execute();


--
To view, visit https://gerrit.wikimedia.org/r/404677
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I9581adc5141873da201ee5b86914e7119179ce81
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/ORES
Gerrit-Branch: master
Gerrit-Owner: Awight <awight@wikimedia.org>
Gerrit-Reviewer: Ladsgroup <Ladsgroup@gmail.com>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits