jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/371968 )
Change subject: Allow to regenerate computed dblists
......................................................................
Allow to regenerate computed dblists
The .dblist files are repeated in the Makefile, so we're sure
it's compatible both with BSD Make and GNU Make.
Bug: T173342
Change-Id: I90942e2642c4573b222ec76ef2516a9cb94a8b8a
---
A dblists/Makefile
M tests/noc-conf/NOCDblistTest.php
2 files changed, 35 insertions(+), 8 deletions(-)
Approvals:
Chad: Looks good to me, approved
jenkins-bot: Verified
diff --git a/dblists/Makefile b/dblists/Makefile
new file mode 100644
index 0000000..d350169
--- /dev/null
+++ b/dblists/Makefile
@@ -0,0 +1,15 @@
+EXPANDDBLIST=../multiversion/bin/expanddblist
+
+all: flow.dblist nowikidatadescriptiontaglines.dblist wikipedia-english.dblist
+
+clean:
+ rm -f flow.dblist nowikidatadescriptiontaglines.dblist
wikipedia-english.dblist
+
+flow.dblist:
+ ${EXPANDDBLIST} flow-computed.dblist > flow.dblist
+
+nowikidatadescriptiontaglines.dblist:
+ ${EXPANDDBLIST} nowikidatadescriptiontaglines-computed.dblist >
nowikidatadescriptiontaglines.dblist
+
+wikipedia-english.dblist:
+ ${EXPANDDBLIST} wikipedia-english-computed.dblist >
wikipedia-english.dblist
diff --git a/tests/noc-conf/NOCDblistTest.php b/tests/noc-conf/NOCDblistTest.php
index 47d71da..4ee1fe1 100644
--- a/tests/noc-conf/NOCDblistTest.php
+++ b/tests/noc-conf/NOCDblistTest.php
@@ -1,21 +1,33 @@
<?php
class NocDblistTest extends PHPUnit_Framework_TestCase {
+
+ private static function getDblists( $dir ) {
+ $files = [];
+
+ foreach ( scandir( $dir ) as $fname ) {
+ if ( substr( $fname, -strlen( '.dblist' ) ) ===
'.dblist' ) {
+ $files[] = $fname;
+ }
+ }
+
+ return $files;
+ }
+
public function testNocDblists() {
$common = dirname( dirname( __DIR__ ) );
$dblistsDir = "$common/dblists/";
$nocConfDir = "$common/docroot/noc/conf/";
- $existingLinks = [];
- foreach ( scandir( $nocConfDir ) as $fname ) {
- if ( substr( $fname, -strlen( '.dblist' ) ) ===
'.dblist' ) {
- $linkDestination = readlink( $nocConfDir .
$fname );
- $this->assertEquals( $linkDestination,
'../../../dblists/' . $fname );
- $existingLinks[] = substr( $linkDestination,
strlen( '../../../dblists/' ) );
- }
+ $existingLinks = self::getDblists( $nocConfDir );
+
+ foreach ( $existingLinks as $fname ) {
+ $linkDestination = readlink( $nocConfDir . $fname );
+ $this->assertEquals( $linkDestination,
'../../../dblists/' . $fname );
}
- $expectedLinks = array_values( array_diff( scandir( $dblistsDir
), [ '.', '..' ] ) );
+ $expectedLinks = self::getDblists( $dblistsDir );
$this->assertEquals( $expectedLinks, $existingLinks );
}
+
}
--
To view, visit https://gerrit.wikimedia.org/r/371968
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I90942e2642c4573b222ec76ef2516a9cb94a8b8a
Gerrit-PatchSet: 5
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Dereckson <dereck...@espace-win.org>
Gerrit-Reviewer: Alex Monk <kren...@gmail.com>
Gerrit-Reviewer: Chad <ch...@wikimedia.org>
Gerrit-Reviewer: Dereckson <dereck...@espace-win.org>
Gerrit-Reviewer: MarcoAurelio <maure...@tools.wmflabs.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
