From 21c915abe632345a6885ce93be50e934498ae5f4 Mon Sep 17 00:00:00 2001
From: eileen <emcnaughton@wikimedia.org>
Date: Sat, 26 Sep 2020 12:23:33 +1200
Subject: [PATCH] Test cleanup fix

Note it's better practice to clean up in the tear down but it looks like someone
tried & failed before so let's see....
---
 tests/phpunit/api/v3/JobProcessMailingTest.php | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/tests/phpunit/api/v3/JobProcessMailingTest.php b/tests/phpunit/api/v3/JobProcessMailingTest.php
index 23153c40e4..71d1854077 100644
--- a/tests/phpunit/api/v3/JobProcessMailingTest.php
+++ b/tests/phpunit/api/v3/JobProcessMailingTest.php
@@ -42,7 +42,6 @@ class api_v3_JobProcessMailingTest extends CiviUnitTestCase {
   private $_mut;
 
   public function setUp() {
-    $this->cleanupMailingTest();
     parent::setUp();
     // DGW
     CRM_Mailing_BAO_MailingJob::$mailsProcessed = 0;
@@ -83,13 +82,10 @@ class api_v3_JobProcessMailingTest extends CiviUnitTestCase {
   /**
    */
   public function tearDown() {
-    //$this->_mut->clearMessages();
     $this->_mut->stop();
     CRM_Utils_Hook::singleton()->reset();
-    $this->quickCleanup(['civicrm_activity_contact', 'civicrm_activity']);
-    // DGW
+    $this->cleanupMailingTest();
     CRM_Mailing_BAO_MailingJob::$mailsProcessed = 0;
-    //$this->cleanupMailingTest();
     parent::tearDown();
   }
 
@@ -572,6 +568,8 @@ class api_v3_JobProcessMailingTest extends CiviUnitTestCase {
       'civicrm_group',
       'civicrm_group_contact',
       'civicrm_contact',
+      'civicrm_activity_contact',
+      'civicrm_activity',
     ]);
   }
 
-- 
2.25.1