jenkins-bot has submitted this change and it was merged.
Change subject: Reset all singletons after each test
......................................................................
Reset all singletons after each test
They were hanging on to stale gateway adapter instances
Change-Id: I2adb8b72097e83163110ba9e22a8d277a38a0bea
---
M tests/DonationInterfaceTestCase.php
1 file changed, 16 insertions(+), 0 deletions(-)
Approvals:
Awight: Looks good to me, approved
jenkins-bot: Verified
diff --git a/tests/DonationInterfaceTestCase.php
b/tests/DonationInterfaceTestCase.php
index f9605cf..5b55a4f 100644
--- a/tests/DonationInterfaceTestCase.php
+++ b/tests/DonationInterfaceTestCase.php
@@ -435,6 +435,22 @@
$_SERVER['HTTP_HOST'] = TESTS_HOSTNAME;
$_SERVER['SERVER_NAME'] = TESTS_HOSTNAME;
$_SERVER['SCRIPT_NAME'] = __FILE__;
+
+ // Wipe out the $instance of these classes to make sure they're
+ // re-created with fresh gateway instances for the next test
+ $singleton_classes = array(
+ 'Gateway_Extras_ConversionLog',
+ 'Gateway_Extras_CustomFilters',
+ 'Gateway_Extras_CustomFilters_Functions',
+ 'Gateway_Extras_CustomFilters_IP_Velocity',
+ 'Gateway_Extras_CustomFilters_MinFraud',
+ 'Gateway_Extras_CustomFilters_Referrer',
+ 'Gateway_Extras_CustomFilters_Source',
+ 'Gateway_Extras_SessionVelocityFilter',
+ );
+ foreach( $singleton_classes as $singleton_class ) {
+ $singleton_class::$instance = null;
+ }
}
/**
--
To view, visit https://gerrit.wikimedia.org/r/212224
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I2adb8b72097e83163110ba9e22a8d277a38a0bea
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/DonationInterface
Gerrit-Branch: master
Gerrit-Owner: Ejegg <eeggles...@wikimedia.org>
Gerrit-Reviewer: Awight <awi...@wikimedia.org>
Gerrit-Reviewer: Ssmith <ssm...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
