From a354251e9dd762b7b2fb32a4f1e255ffb511b54b Mon Sep 17 00:00:00 2001 From: eileen Date: Fri, 13 May 2016 14:01:26 +1200 Subject: [PATCH] Remove ornery test marker. The test is now fixed & should pass in CI --- tests/phpunit/CRM/Dedupe/MergerTest.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/phpunit/CRM/Dedupe/MergerTest.php b/tests/phpunit/CRM/Dedupe/MergerTest.php index 27680ae0d0..2d0a4753c8 100644 --- a/tests/phpunit/CRM/Dedupe/MergerTest.php +++ b/tests/phpunit/CRM/Dedupe/MergerTest.php @@ -121,7 +121,7 @@ class CRM_Dedupe_MergerTest extends CiviUnitTestCase { } /** - * @group ornery + * Test the batch merge. */ public function testBatchMergeSelectedDuplicates() { $this->createDupeContacts(); @@ -183,7 +183,7 @@ class CRM_Dedupe_MergerTest extends CiviUnitTestCase { } /** - * @group ornery + * Test the batch merge. */ public function testBatchMergeAllDuplicates() { $this->createDupeContacts(); -- 2.25.1