jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/379416 )
Change subject: Merge branch 'master' of https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment ...................................................................... Merge branch 'master' of https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment + 68732e38560d68feaf0899efb0d7f47a31e049fd Define a constant to allow switching dbs for phpunit + 8973ebe802e98ada6cd663e5180ec9eff50f5335 Orphan Slayer Module + b961f2c0e51d59f467efaa2a193554654cdb0e3f Minor refactor on Omnimail classes. + d4277e9c65e82c54c80166faeb59b775db6c09cd Update Omnimail vendor dir to support offset on recipients. + d7a2c9bd2a23ec98bdba0c984332699ad6e22a3a Update Omnimail Recipient.load to support offset & limit + 2488f25eea81e748f3336934ce789ad7ed616bb9 Update Omnimail jobs to support storing settings about multiple jobs. + f060a249b60a9df7c6673ade540120f754d6a7dd Update Omnimail recipient load to support parameterised batching. Change-Id: Ie2a729e222ce3b289551ecb5be0da8c190d3bef8 --- D phpunit.xml 1 file changed, 0 insertions(+), 53 deletions(-) Approvals: jenkins-bot: Verified Eileen: Looks good to me, approved diff --git a/phpunit.xml b/phpunit.xml deleted file mode 100644 index 66a2d0a..0000000 --- a/phpunit.xml +++ /dev/null @@ -1,53 +0,0 @@ -<<<<<<< HEAD (0fb467 Fix last vendor commit) -======= -<phpunit - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/3.7/phpunit.xsd"; - bootstrap="sites/default/bootstrap-phpunit.php"> - - - <testsuites> - <testsuite name="large_donation tests"> - <directory>sites/all/modules/large_donation/tests</directory> - </testsuite> - <testsuite name="offline2civicrm tests"> - <directory>sites/all/modules/offline2civicrm/tests</directory> - <exclude>sites/all/modules/offline2civicrm/tests/includes/BaseChecksFileTest.php</exclude> - </testsuite> - <testsuite name="exchange_rates tests"> - <directory>sites/all/modules/exchange_rates/tests/phpunit</directory> - </testsuite> - <testsuite name="orphan_slayer tests"> - <directory>sites/all/modules/orphan_slayer/tests/phpunit</directory> - </testsuite> - <testsuite name="queue2civicrm tests"> - <directory>sites/all/modules/queue2civicrm/tests/phpunit</directory> - </testsuite> - <testsuite name="recurring_globalcollect tests"> - <directory>sites/all/modules/recurring_globalcollect/tests</directory> - </testsuite> - <testsuite name="thank_you tests"> - <directory>sites/all/modules/thank_you/tests/phpunit</directory> - </testsuite> - <testsuite name="wmf_audit tests"> - <directory>sites/all/modules/wmf_audit/tests</directory> - </testsuite> - <testsuite name="wmf_campaigns tests"> - <directory>sites/all/modules/wmf_campaigns/tests</directory> - </testsuite> - <testsuite name="wmf_civicrm tests"> - <directory>sites/all/modules/wmf_civicrm/tests/phpunit</directory> - </testsuite> - <testsuite name="wmf_common tests"> - <directory>sites/all/modules/wmf_common/tests/phpunit</directory> - </testsuite> - <testsuite name="wmf_communication tests"> - <directory>sites/all/modules/wmf_communication/tests/phpunit</directory> - <exclude>sites/all/modules/wmf_communication/tests/phpunit/CiviMailTestBase.php</exclude> - </testsuite> - <testsuite name="omnimail_tests"> - <directory>sites/default/civicrm/extensions/org.wikimedia.omnimail/tests/phpunit</directory> - </testsuite> - </testsuites> -</phpunit> ->>>>>>> BRANCH (f060a2 Update Omnimail recipient load to support parameterised batc) -- To view, visit https://gerrit.wikimedia.org/r/379416 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ie2a729e222ce3b289551ecb5be0da8c190d3bef8 Gerrit-PatchSet: 1 Gerrit-Project: wikimedia/fundraising/crm Gerrit-Branch: deployment Gerrit-Owner: Eileen <[email protected]> Gerrit-Reviewer: Eileen <[email protected]> Gerrit-Reviewer: Ejegg <[email protected]> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
