From: Mattias Michaux <mattias.michaux@gmail.com>
Date: Mon, 16 May 2016 19:49:43 +0000 (+0200)
Subject: Disabled other obsolete output.
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=64fe2fe024e03e0b9d9866c039f8c10f4dd6dc24;p=civicrm-core.git

Disabled other obsolete output.
---

diff --git a/tests/phpunit/CRM/Dedupe/MergerTest.php b/tests/phpunit/CRM/Dedupe/MergerTest.php
index 069743f785..b86eb8b3a5 100644
--- a/tests/phpunit/CRM/Dedupe/MergerTest.php
+++ b/tests/phpunit/CRM/Dedupe/MergerTest.php
@@ -157,6 +157,7 @@ class CRM_Dedupe_MergerTest extends CiviUnitTestCase {
     $object->set('gid', $this->_groupId);
     $object->set('rgid', $dao->id);
     $object->set('action', CRM_Core_Action::UPDATE);
+    $object->setEmbedded(TRUE);
     @$object->run();
 
     // Retrieve pairs from prev next cache table
@@ -219,6 +220,7 @@ class CRM_Dedupe_MergerTest extends CiviUnitTestCase {
     $object->set('gid', $this->_groupId);
     $object->set('rgid', $dao->id);
     $object->set('action', CRM_Core_Action::UPDATE);
+    $object->setEmbedded(TRUE);
     @$object->run();
 
     // Retrieve pairs from prev next cache table