From fcd647c040863b399bd2b8c90e7aeb31bb1313b8 Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Sat, 2 Jan 2021 01:25:21 -0800
Subject: [PATCH] CiviTestListener - Ensure that mocked times are always
 cleaned up

---
 Civi/Test/CiviTestListener.php         | 1 +
 Civi/Test/CiviTestListenerPHPUnit7.php | 1 +
 Civi/Test/Legacy/CiviTestListener.php  | 1 +
 3 files changed, 3 insertions(+)

diff --git a/Civi/Test/CiviTestListener.php b/Civi/Test/CiviTestListener.php
index 2851bda3d8..71c595a0b5 100644
--- a/Civi/Test/CiviTestListener.php
+++ b/Civi/Test/CiviTestListener.php
@@ -85,6 +85,7 @@ else {
       if ($test instanceof HookInterface) {
         \CRM_Utils_Hook::singleton()->reset();
       }
+      \CRM_Utils_Time::resetTime();
       if ($this->isCiviTest($test)) {
         error_reporting(E_ALL & ~E_NOTICE);
         $this->errorScope = NULL;
diff --git a/Civi/Test/CiviTestListenerPHPUnit7.php b/Civi/Test/CiviTestListenerPHPUnit7.php
index ee8173d2b8..8cd76f46ff 100644
--- a/Civi/Test/CiviTestListenerPHPUnit7.php
+++ b/Civi/Test/CiviTestListenerPHPUnit7.php
@@ -78,6 +78,7 @@ class CiviTestListenerPHPUnit7 implements \PHPUnit\Framework\TestListener {
     if ($test instanceof HookInterface) {
       \CRM_Utils_Hook::singleton()->reset();
     }
+    \CRM_Utils_Time::resetTime();
     if ($this->isCiviTest($test)) {
       error_reporting(E_ALL & ~E_NOTICE);
       $this->errorScope = NULL;
diff --git a/Civi/Test/Legacy/CiviTestListener.php b/Civi/Test/Legacy/CiviTestListener.php
index eb85e8906e..6533c33a46 100644
--- a/Civi/Test/Legacy/CiviTestListener.php
+++ b/Civi/Test/Legacy/CiviTestListener.php
@@ -74,6 +74,7 @@ class CiviTestListener extends \PHPUnit_Framework_BaseTestListener {
     if ($test instanceof \Civi\Test\HookInterface) {
       \CRM_Utils_Hook::singleton()->reset();
     }
+    \CRM_Utils_Time::resetTime();
     if ($this->isCiviTest($test)) {
       error_reporting(E_ALL & ~E_NOTICE);
       $this->errorScope = NULL;
-- 
2.25.1