[MediaWiki-commits] [Gerrit] Explicitly load BaseChecksFileTest in test bootstrap - change (wikimedia...crm)

2015-11-06 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged.

Change subject: Explicitly load BaseChecksFileTest in test bootstrap
..


Explicitly load BaseChecksFileTest in test bootstrap

And remove it from the module's .info file, since
Drupal should never need to load it.

Change-Id: I6124ae5791aa9589c6749a8bb0228ff247fe3a5f
---
M sites/all/modules/offline2civicrm/offline2civicrm.info
M sites/default/bootstrap-phpunit.php
2 files changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/sites/all/modules/offline2civicrm/offline2civicrm.info 
b/sites/all/modules/offline2civicrm/offline2civicrm.info
index 031a57e..976e200 100644
--- a/sites/all/modules/offline2civicrm/offline2civicrm.info
+++ b/sites/all/modules/offline2civicrm/offline2civicrm.info
@@ -24,5 +24,4 @@
 files[] = TrilogyFile.php
 files[] = WmfImportFile.php
 files[] = WmfOrgImportFile.php
-files[] = tests/includes/BaseChecksFileTest.php
 
diff --git a/sites/default/bootstrap-phpunit.php 
b/sites/default/bootstrap-phpunit.php
index 0df07c8..08a36d1 100644
--- a/sites/default/bootstrap-phpunit.php
+++ b/sites/default/bootstrap-phpunit.php
@@ -2,6 +2,7 @@
 
 define( 'DRUPAL_ROOT', realpath( __DIR__ ) . "/../../drupal" );
 require_once( DRUPAL_ROOT . 
"/sites/all/modules/wmf_common/tests/includes/BaseWmfDrupalPhpUnitTestCase.php" 
);
+require_once( DRUPAL_ROOT . 
"/sites/all/modules/offline2civicrm/tests/includes/BaseChecksFileTest.php" );
 
 // Argh.  Crib from _drush_bootstrap_drupal_site_validate
 $_SERVER['REMOTE_ADDR'] = '127.0.0.1';

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I6124ae5791aa9589c6749a8bb0228ff247fe3a5f
Gerrit-PatchSet: 4
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: master
Gerrit-Owner: Ejegg 
Gerrit-Reviewer: Awight 
Gerrit-Reviewer: Cdentinger 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Explicitly load BaseChecksFileTest in test bootstrap - change (wikimedia...crm)

2015-11-06 Thread Ejegg (Code Review) 
Ejegg has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/251654

Change subject: Explicitly load BaseChecksFileTest in test bootstrap
..

Explicitly load BaseChecksFileTest in test bootstrap

Don't rely on it being in Drupal's cache, since it's missing from
deployment branch.

Change-Id: I6124ae5791aa9589c6749a8bb0228ff247fe3a5f
---
M sites/default/bootstrap-phpunit.php
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/54/251654/1

diff --git a/sites/default/bootstrap-phpunit.php 
b/sites/default/bootstrap-phpunit.php
index 0df07c8..08a36d1 100644
--- a/sites/default/bootstrap-phpunit.php
+++ b/sites/default/bootstrap-phpunit.php
@@ -2,6 +2,7 @@
 
 define( 'DRUPAL_ROOT', realpath( __DIR__ ) . "/../../drupal" );
 require_once( DRUPAL_ROOT . 
"/sites/all/modules/wmf_common/tests/includes/BaseWmfDrupalPhpUnitTestCase.php" 
);
+require_once( DRUPAL_ROOT . 
"/sites/all/modules/offline2civicrm/tests/includes/BaseChecksFileTest.php" );
 
 // Argh.  Crib from _drush_bootstrap_drupal_site_validate
 $_SERVER['REMOTE_ADDR'] = '127.0.0.1';

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I6124ae5791aa9589c6749a8bb0228ff247fe3a5f
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: master
Gerrit-Owner: Ejegg 

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