From: eileen <emcnaughton@wikimedia.org>
Date: Fri, 13 May 2016 02:01:26 +0000 (+1200)
Subject: Remove ornery test marker.
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=a354251e9dd762b7b2fb32a4f1e255ffb511b54b;p=civicrm-core.git

Remove ornery test marker.

The test is now fixed & should pass in CI
---

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();