Retry scheduled tasks on failure (#18335)

* Catch and log errors for scheduled tasks

* Added retry on exception mechanism for scheduled tasks

* Replace error code with custom exception

* Fix/workaround for SchedulerTest mock breaking retry list option loading

* Log warning instead of info if a task has failed three times

* Added basic tests, minor code improvements

* Test fix

* Fix for test

* Added integration test to check that only tasks that throw exceptions are scheduled for retry

1 files changed, 15 insertions, 0 deletions

diff --git a/tests/PHPUnit/Unit/Scheduler/TimetableTest.php b/tests/PHPUnit/Unit/Scheduler/TimetableTest.php
index 1518d1f833..2d930b0d06 100644
--- a/tests/PHPUnit/Unit/Scheduler/TimetableTest.php
+++ b/tests/PHPUnit/Unit/Scheduler/TimetableTest.php
@@ -81,6 +81,21 @@ class TimetableTest extends \PHPUnit\Framework\TestCase
         $this->assertEquals(Date::factory('tomorrow')->getTimeStamp(), $timetable->getTimetable()[$task->getName()]);
     }
 
+    public function testRescheduleTaskAndRunInOneHour()
+    {
+        self::stubPiwikOption(serialize([]));
+
+        $timetable = new Timetable();
+        $task = $this->getMockBuilder(Task::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $task->method('getName')->willReturn('taskName');
+
+        $timetable->rescheduleTaskAndRunInOneHour($task);
+
+        $this->assertEquals(Date::factory('now')->addHour(1)->getTimeStamp(), $timetable->getTimetable()[$task->getName()]);
+    }
+
     /**
      * Dataprovider for testTaskHasBeenScheduledOnce
      */