From b6f6203e650632ff59ece01d6e0ccd8c92b98e01 Mon Sep 17 00:00:00 2001
From: Tomo Tsuyuki <tomotsuyuki@catalyst-au.net>
Date: Tue, 30 Mar 2021 10:54:08 +1100
Subject: [PATCH] MDL-71136 backup: Fix moodle_exception path.

---
 backup/tests/automated_backup_test.php  | 67 +++++++++++++++++++++++++
 lib/classes/task/course_backup_task.php |  2 +-
 2 files changed, 68 insertions(+), 1 deletion(-)

diff --git a/backup/tests/automated_backup_test.php b/backup/tests/automated_backup_test.php
index c76d9529f3d..c2fb61e4ad8 100644
--- a/backup/tests/automated_backup_test.php
+++ b/backup/tests/automated_backup_test.php
@@ -278,6 +278,73 @@ class core_backup_automated_backup_testcase extends advanced_testcase {
         $this->assertTrue($skipped);
         $this->expectOutputRegex("/Skipping $course->fullname \(Not modified since previous backup\)/");
     }
+
+    /**
+     * Test the task completes when coureid is missing.
+     */
+    public function test_task_complete_when_courseid_is_missing() {
+        global $DB;
+        $admin = get_admin();
+        $classobject = $this->backupcronautomatedhelper->return_this();
+
+        // Create this backup course.
+        $backupcourse = new stdClass;
+        $backupcourse->courseid = $this->course->id;
+        $backupcourse->laststatus = backup_cron_automated_helper::BACKUP_STATUS_NOTYETRUN;
+        $DB->insert_record('backup_courses', $backupcourse);
+        $backupcourse = $DB->get_record('backup_courses', ['courseid' => $this->course->id]);
+
+        // Create a backup task.
+        $method = new ReflectionMethod('\backup_cron_automated_helper', 'push_course_backup_adhoc_task');
+        $method->setAccessible(true); // Allow accessing of private method.
+        $method->invokeArgs($classobject, [$backupcourse, $admin]);
+
+        // Delete course for this test.
+        delete_course($this->course->id, false);
+
+        $task = core\task\manager::get_next_adhoc_task(time());
+
+        ob_start();
+        $task->execute();
+        $output = ob_get_clean();
+
+        $this->assertStringContainsString('Invalid course id: ' . $this->course->id . ', task aborted.', $output);
+        core\task\manager::adhoc_task_complete($task);
+    }
+
+    /**
+     * Test the task completes when backup course is missing.
+     */
+    public function test_task_complete_when_backup_course_is_missing() {
+        global $DB;
+        $admin = get_admin();
+        $classobject = $this->backupcronautomatedhelper->return_this();
+
+        // Create this backup course.
+        $backupcourse = new stdClass;
+        $backupcourse->courseid = $this->course->id;
+        $backupcourse->laststatus = backup_cron_automated_helper::BACKUP_STATUS_NOTYETRUN;
+        $DB->insert_record('backup_courses', $backupcourse);
+        $backupcourse = $DB->get_record('backup_courses', ['courseid' => $this->course->id]);
+
+        // Create a backup task.
+        $method = new ReflectionMethod('\backup_cron_automated_helper', 'push_course_backup_adhoc_task');
+        $method->setAccessible(true); // Allow accessing of private method.
+        $method->invokeArgs($classobject, [$backupcourse, $admin]);
+
+        // Delete backup course for this test.
+        $DB->delete_records('backup_courses', ['courseid' => $this->course->id]);
+
+        $task = core\task\manager::get_next_adhoc_task(time());
+
+        ob_start();
+        $task->execute();
+        $output = ob_get_clean();
+
+        $this->assertStringContainsString('Automated backup for course: ' . $this->course->fullname . ' encounters an error.',
+            $output);
+        core\task\manager::adhoc_task_complete($task);
+    }
 }
 
 /**
diff --git a/lib/classes/task/course_backup_task.php b/lib/classes/task/course_backup_task.php
index 0023d94aa33..cfd6aebf8ad 100644
--- a/lib/classes/task/course_backup_task.php
+++ b/lib/classes/task/course_backup_task.php
@@ -48,7 +48,7 @@ class course_backup_task extends \core\task\adhoc_task {
 
         try {
             $course = $DB->get_record('course', array('id' => $courseid), '*', MUST_EXIST);
-        } catch (moodle_exception $e) {
+        } catch (\moodle_exception $e) {
             mtrace('Invalid course id: ' . $courseid . ', task aborted.');
             return;
         }