jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/380567 )
Change subject: Merge branch 'master' into deployment ...................................................................... Merge branch 'master' into deployment 8d2491ebd Omnimail recipient job: Follow up fix on suffix bfb2a02ac Omnimail recipient - further fixes to batching. 437b9c9e0 Prometheus metrics reporting 3b5030560 Update FR thank you email Change-Id: Ieb919206336258bb374373f21bcd6862ded51608 --- D phpunit.xml D sites/all/modules/metrics_reporting/tests/phpunit/PrometheusReporterTest.php 2 files changed, 0 insertions(+), 86 deletions(-) Approvals: jenkins-bot: Verified Ejegg: Looks good to me, approved diff --git a/phpunit.xml b/phpunit.xml deleted file mode 100644 index de69c07..0000000 --- a/phpunit.xml +++ /dev/null @@ -1,56 +0,0 @@ -<<<<<<< HEAD (45c56c Merge branch 'master' into deployment) -======= -<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="metrics_reporting tests"> - <directory>sites/all/modules/metrics_reporting/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 (3b5030 Update FR thank you email) diff --git a/sites/all/modules/metrics_reporting/tests/phpunit/PrometheusReporterTest.php b/sites/all/modules/metrics_reporting/tests/phpunit/PrometheusReporterTest.php deleted file mode 100644 index 3f489db..0000000 --- a/sites/all/modules/metrics_reporting/tests/phpunit/PrometheusReporterTest.php +++ /dev/null @@ -1,30 +0,0 @@ -<?php - -/** - * @group Metrics - */ -class PrometheusReporterTest extends BaseWmfDrupalPhpUnitTestCase { - public function testReportMetrics() { - $dir = CRM_Utils_File::tempdir(); - $reporter = new PrometheusReporter( $dir ); - $metrics = array( - 'daisies_picked' => 157, - 'orcs_befriended' => 3, - 'prisoners_freed' => 5, - ); - $reporter->reportMetrics( 'foo', $metrics ); - $filename = $dir . DIRECTORY_SEPARATOR . 'foo'; - $this->assertFileExists( $filename ); - // don't want the trailing newline - $written = rtrim( file_get_contents( $filename ) ); - $split = explode( "\n", $written ); - foreach ( $split as $metric ) { - list( $name, $value ) = explode( ' ', $metric ); - $this->assertEquals( $metrics[$name], $value ); - unset( $metrics[$name] ); - } - $this->assertEmpty( $metrics, 'A metric was left unwritten' ); - unlink( $filename ); - rmdir( $dir ); - } -} -- To view, visit https://gerrit.wikimedia.org/r/380567 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ieb919206336258bb374373f21bcd6862ded51608 Gerrit-PatchSet: 1 Gerrit-Project: wikimedia/fundraising/crm Gerrit-Branch: deployment Gerrit-Owner: Ejegg <ej...@ejegg.com> Gerrit-Reviewer: Ejegg <ej...@ejegg.com> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
