wikimedia/mediawiki-extensions-AbuseFilter
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/AbuseFilter.git synced 2024-11-23 21:53:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Try to unbreak tests on sqlite

Browse source 
Change-Id: I65cf163c8698a7457986ef2354c8fa9e30dc47c5
This commit is contained in:
Matěj Suchánek 2022-07-14 16:53:09 +02:00
parent d3c980e62d
commit 6b0a8117b8
2 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
tests/phpunit/AbuseFilterConsequencesTest.php
View file

@ -1449,6 +1449,8 @@ class AbuseFilterConsequencesTest extends MediaWikiIntegrationTestCase {
public function testGlobalFilters( $createIds, $actionParams, $consequences ) {
// cannot access temporary tables of other sessions
$this->markTestSkippedIfDbType( 'postgres' );
// Read from wrong table: unittest_external_abuse_filter
$this->markTestSkippedIfDbType( 'sqlite' );
$this->setMwGlobals( [
'wgAbuseFilterCentralDB' => $this->db->getDBname() . '-' . $this->dbPrefix() .

12
tests/phpunit/RCVariableGeneratorTest.php
View file

@ -3,6 +3,7 @@
use MediaWiki\Extension\AbuseFilter\AbuseFilterServices;
use MediaWiki\Extension\AbuseFilter\Parser\AFPData;
use MediaWiki\Extension\AbuseFilter\Variables\LazyLoadedVariable;
use MediaWiki\Revision\RevisionRecord;
/**
* @group Test
@ -20,7 +21,6 @@ class RCVariableGeneratorTest extends MediaWikiIntegrationTestCase {
protected $tablesUsed = [
'page',
'text',
'page_restrictions',
'user',
'recentchanges',
'image',
@ -155,7 +155,8 @@ class RCVariableGeneratorTest extends MediaWikiIntegrationTestCase {
throw new LogicException( "Type $type not recognized!" );
}
$rc = RecentChange::newFromConds( $rcConds, __METHOD__ );
DeferredUpdates::doUpdates();
$rc = RecentChange::newFromConds( $rcConds, __METHOD__, DB_PRIMARY );
$this->assertNotNull( $rc, 'RC item found' );
$varGenerator = AbuseFilterServices::getVariableGeneratorFactory()->newRCGenerator(
@ -199,6 +200,7 @@ class RCVariableGeneratorTest extends MediaWikiIntegrationTestCase {
/**
* @covers ::addEditVars
* @covers ::addEditVarsForRow
* @covers ::addGenericVars
* @covers \MediaWiki\Extension\AbuseFilter\Variables\LazyVariableComputer
*/
public function testAddEditVarsForRow() {
@ -222,7 +224,11 @@ class RCVariableGeneratorTest extends MediaWikiIntegrationTestCase {
/** @var RevisionRecord $revRecord */
$revRecord = $status->value['revision-record'];
$rc = RecentChange::newFromConds( [ 'rc_this_oldid' => $revRecord->getId() ], __METHOD__ );
$rc = RecentChange::newFromConds(
[ 'rc_this_oldid' => $revRecord->getId() ],
__METHOD__,
DB_PRIMARY
);
$this->assertNotNull( $rc, 'RC item found' );
// one more tick to reliably test page_age