Paladox has uploaded a new change for review.
https://gerrit.wikimedia.org/r/268827
Change subject: Temporarily disable unit tests and autoloading autoload.php
from composer
......................................................................
Temporarily disable unit tests and autoloading autoload.php from composer
Since this test is failing REL1_25 branch and others and wasent even
testing because it uses an old config lets turn it off temporarily for
REL1_25 branch. Until a hack can be created.
Adds two new configs
$wmgUseWikidata is for turning off vendor if you want but is on by default.
$wmgUseWikidataTest is for turning on the unit tests. Since they fail this is
off by default.
Bug: T125722
Change-Id: I5c74bb1a34009cb110d20e43bce8c4349bf7f3a4
---
M Wikidata.php
M extensions/PropertySuggester/PropertySuggester.php
M extensions/ValueView/ValueView.mw.php
M extensions/Wikibase/client/WikibaseClient.php
M extensions/Wikibase/lib/WikibaseLib.php
M extensions/Wikibase/repo/Wikibase.php
6 files changed, 55 insertions(+), 25 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikidata
refs/changes/27/268827/1
diff --git a/Wikidata.php b/Wikidata.php
index 0610e8e..9954905 100644
--- a/Wikidata.php
+++ b/Wikidata.php
@@ -4,35 +4,47 @@
}
// Jenkins stuff part1
-if ( PHP_SAPI === 'cli' && strpos( getenv( 'JOB_NAME' ),
'mwext-Wikidata-testextension' ) !== false ) {
+if ( isset( $wgWikimediaJenkinsCI ) && $wgWikimediaJenkinsCI == true ) {
// in future, run as non-experimental
if ( !defined( 'WB_EXPERIMENTAL_FEATURES' ) ||
!WB_EXPERIMENTAL_FEATURES ) {
define( 'WB_EXPERIMENTAL_FEATURES', true );
}
- $wmgUseWikibaseRepo = true;
- $wmgUseWikibaseClient = true;
+ /* Hack for REL1_25 since it is failing */
+ $wmgUseWikidata = true;
+ $wmgUseWikidataTest = false;
+
+ if ( isset( $wmgUseWikidata ) && $wmgUseWikidata == true ) {
+ $wmgUseWikibaseRepo = true;
+ $wmgUseWikibaseClient = true;
+ }
}
// no magic, use wmf configs instead to control which entry points to load
$wgEnableWikibaseRepo = false;
$wgEnableWikibaseClient = false;
-include_once __DIR__ . '/vendor/autoload.php';
+if ( isset( $wmgUseWikidata ) && $wmgUseWikidata == true ) {
+ if ( file_exists( __DIR__ . '/vendor/autoload.php' ) ) {
+ include_once __DIR__ . '/vendor/autoload.php';
+ }
+}
-if ( !empty( $wmgUseWikibaseRepo ) ) {
+if ( isset( $wmgUseWikibaseRepo ) && $wmgUseWikibaseRepo == true ) {
include_once __DIR__ . '/extensions/Wikibase/repo/Wikibase.php';
include_once __DIR__ . '/extensions/Wikidata.org/WikidataOrg.php';
include_once __DIR__ .
'/extensions/PropertySuggester/PropertySuggester.php';
include_once __DIR__ . '/WikibaseRepo.settings.php';
}
-if ( !empty( $wmgUseWikibaseClient ) ) {
+if ( isset( $wmgUseWikibaseClient ) && $wmgUseWikibaseClient == true ) {
include_once __DIR__ . '/extensions/Wikibase/client/WikibaseClient.php';
include_once __DIR__ . '/WikibaseClient.settings.php';
}
-$wgHooks['UnitTestsList'][] = '\Wikidata\WikidataHooks::onUnitTestsList';
+if ( isset( $wmgUseWikidataTest ) && $wmgUseWikidataTest == true ) {
+ $wgHooks['UnitTestsList'][] =
'\Wikidata\WikidataHooks::onUnitTestsList';
+}
$wgExtensionCredits['wikibase'][] = array(
'path' => __FILE__,
@@ -45,7 +57,7 @@
);
// Jenkins stuff part2
-if ( PHP_SAPI === 'cli' && strpos( getenv( 'JOB_NAME' ),
'mwext-Wikidata-testextension' ) !== false ) {
+if ( isset( $wgWikimediaJenkinsCI ) && $wgWikimediaJenkinsCI == true ) {
//Jenkins always loads both so no need to check if they are loaded
before getting settings
require_once __DIR__ . '/extensions/Wikibase/repo/ExampleSettings.php';
require_once __DIR__ .
'/extensions/Wikibase/client/ExampleSettings.php';
diff --git a/extensions/PropertySuggester/PropertySuggester.php
b/extensions/PropertySuggester/PropertySuggester.php
index b8202c9..e9b904c 100644
--- a/extensions/PropertySuggester/PropertySuggester.php
+++ b/extensions/PropertySuggester/PropertySuggester.php
@@ -35,9 +35,13 @@
global $wgAPIModules;
$wgAPIModules['wbsgetsuggestions'] = 'PropertySuggester\GetSuggestions';
-global $wgHooks;
+global $wgHooks, $wmgUseWikidataTest;
$wgHooks['BeforePageDisplay'][] =
'PropertySuggesterHooks::onBeforePageDisplay';
-$wgHooks['UnitTestsList'][] = 'PropertySuggesterHooks::onUnitTestsList';
+
+if ( isset( $wmgUseWikidataTest ) && $wmgUseWikidataTest == true ) {
+ $wgHooks['UnitTestsList'][] = 'PropertySuggesterHooks::onUnitTestsList';
+}
+
$wgHooks['LoadExtensionSchemaUpdates'][] =
'PropertySuggesterHooks::onCreateSchema';
$remoteExtPathParts = explode(
diff --git a/extensions/ValueView/ValueView.mw.php
b/extensions/ValueView/ValueView.mw.php
index 45f4bec..4b4beb7 100644
--- a/extensions/ValueView/ValueView.mw.php
+++ b/extensions/ValueView/ValueView.mw.php
@@ -37,17 +37,19 @@
* @param \ResourceLoader &$resourceLoader
* @return boolean
*/
-$wgHooks['ResourceLoaderTestModules'][] = function(
- array &$testModules,
- \ResourceLoader &$resourceLoader
-) {
- $testModules['qunit'] = array_merge(
- $testModules['qunit'],
- include( __DIR__ . '/tests/lib/resources.php' ),
- include( __DIR__ . '/tests/src/resources.php' )
- );
- return true;
-};
+if ( isset( $wmgUseWikidataTest ) && $wmgUseWikidataTest == true ) {
+ $wgHooks['ResourceLoaderTestModules'][] = function(
+ array &$testModules,
+ \ResourceLoader &$resourceLoader
+ ) {
+ $testModules['qunit'] = array_merge(
+ $testModules['qunit'],
+ include( __DIR__ . '/tests/lib/resources.php' ),
+ include( __DIR__ . '/tests/src/resources.php' )
+ );
+ return true;
+ };
+}
// Register Resource Loader modules:
$wgResourceModules = array_merge(
diff --git a/extensions/Wikibase/client/WikibaseClient.php
b/extensions/Wikibase/client/WikibaseClient.php
index abf4be1..0207212 100644
--- a/extensions/Wikibase/client/WikibaseClient.php
+++ b/extensions/Wikibase/client/WikibaseClient.php
@@ -67,6 +67,7 @@
global $wgExtensionCredits, $wgExtensionMessagesFiles, $wgHooks;
global $wgAPIMetaModules, $wgAPIPropModules, $wgSpecialPages,
$wgResourceModules;
global $wgWBClientSettings, $wgRecentChangesFlags, $wgMessagesDirs;
+ global $wmgUseWikidataTest;
$wgExtensionCredits['wikibase'][] = array(
'path' => __DIR__,
@@ -87,7 +88,10 @@
$wgExtensionMessagesFiles['wikibaseclientmagic'] = $dir .
'WikibaseClient.i18n.magic.php';
// Hooks
- $wgHooks['UnitTestsList'][] =
'\Wikibase\ClientHooks::registerUnitTests';
+ if ( isset( $wmgUseWikidataTest ) && $wmgUseWikidataTest == true ) {
+ $wgHooks['UnitTestsList'][] =
'\Wikibase\ClientHooks::registerUnitTests';
+ }
+
$wgHooks['BaseTemplateToolbox'][] =
'\Wikibase\ClientHooks::onBaseTemplateToolbox';
$wgHooks['OldChangesListRecentChangesLine'][] =
'\Wikibase\ClientHooks::onOldChangesListRecentChangesLine';
$wgHooks['OutputPageParserOutput'][] =
'\Wikibase\Client\Hooks\SidebarHookHandlers::onOutputPageParserOutput';
diff --git a/extensions/Wikibase/lib/WikibaseLib.php
b/extensions/Wikibase/lib/WikibaseLib.php
index 543c842..87df625 100644
--- a/extensions/Wikibase/lib/WikibaseLib.php
+++ b/extensions/Wikibase/lib/WikibaseLib.php
@@ -54,6 +54,7 @@
call_user_func( function() {
global $wgExtensionCredits, $wgJobClasses, $wgHooks,
$wgResourceModules, $wgMessagesDirs;
+ global $wmgUseWikidataTest;
$wgExtensionCredits['wikibase'][] = array(
'path' => __DIR__,
@@ -74,7 +75,10 @@
$wgJobClasses['ChangeNotification'] = 'Wikibase\ChangeNotificationJob';
// Hooks
- $wgHooks['UnitTestsList'][]
= 'Wikibase\LibHooks::registerPhpUnitTests';
+ if ( isset( $wmgUseWikidataTest ) && $wmgUseWikidataTest == true ) {
+ $wgHooks['UnitTestsList'][]
= 'Wikibase\LibHooks::registerPhpUnitTests';
+ }
+
$wgHooks['ResourceLoaderTestModules'][] =
'Wikibase\LibHooks::registerQUnitTests';
/**
diff --git a/extensions/Wikibase/repo/Wikibase.php
b/extensions/Wikibase/repo/Wikibase.php
index 5a73d8e..23c91a5 100644
--- a/extensions/Wikibase/repo/Wikibase.php
+++ b/extensions/Wikibase/repo/Wikibase.php
@@ -82,6 +82,7 @@
global $wgExtensionCredits, $wgGroupPermissions,
$wgExtensionMessagesFiles, $wgMessagesDirs;
global $wgAPIModules, $wgSpecialPages, $wgHooks, $wgAvailableRights;
global $wgWBRepoSettings, $wgResourceModules, $wgValueParsers,
$wgJobClasses;
+ global $wmgUseWikidataTest;
$wgExtensionCredits['wikibase'][] = array(
'path' => __DIR__,
@@ -192,9 +193,12 @@
// Hooks
$wgHooks['BeforePageDisplay'][]
= 'Wikibase\RepoHooks::onBeforePageDisplay';
$wgHooks['LoadExtensionSchemaUpdates'][] =
'Wikibase\RepoHooks::onSchemaUpdate';
- $wgHooks['UnitTestsList'][]
= 'Wikibase\RepoHooks::registerUnitTests';
- $wgHooks['ResourceLoaderTestModules'][] =
'Wikibase\RepoHooks::registerQUnitTests';
+ if ( isset( $wmgUseWikidataTest ) && $wmgUseWikidataTest == true ) {
+ $wgHooks['UnitTestsList'][]
= 'Wikibase\RepoHooks::registerUnitTests';
+ }
+
+ $wgHooks['ResourceLoaderTestModules'][] =
'Wikibase\RepoHooks::registerQUnitTests';
$wgHooks['NamespaceIsMovable'][]
= 'Wikibase\RepoHooks::onNamespaceIsMovable';
$wgHooks['NewRevisionFromEditComplete'][] =
'Wikibase\RepoHooks::onNewRevisionFromEditComplete';
$wgHooks['SkinTemplateNavigation'][] =
'Wikibase\RepoHooks::onPageTabs';
--
To view, visit https://gerrit.wikimedia.org/r/268827
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I5c74bb1a34009cb110d20e43bce8c4349bf7f3a4
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikidata
Gerrit-Branch: master
Gerrit-Owner: Paladox <thomasmulhall...@yahoo.com>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
