MDL-83468 phpunit: Do not throw exception in mocked destructor

PHPUnit removed the ability to mock a destructor, but our lock system
throws an exception if a lock has not been explicitly released in its
destructor.

Normally thhis is fine because the lock is released, and if not then we
want to know about it.

However, where we are mocking the lock, we do not actually obtain the
lock, and we may expect the test to fail.

This change moves the release and notification to a separate, reusable
public method, which is called from the destructor. This allows it to be
mocked at the appropriate time.
This commit is contained in:
Andrew Nicols
2025-01-20 16:47:56 +01:00
committed by Sara Arjona
parent 118b3ccf46
commit 9536ca738e
2 changed files with 27 additions and 11 deletions
+25 -9
View File
@@ -106,19 +106,35 @@ class lock {
}
/**
* Print debugging if this lock falls out of scope before being released.
* Release a lock if it has not already been released.
*
* @param bool $withexception If true, throw an exception if the lock has not been released.
* @throws \coding_exception
*/
public function __destruct() {
if (!$this->released && defined('PHPUNIT_TEST')) {
public function release_if_not_released(bool $withexception = false): void {
if (!$this->released) {
$key = $this->key;
$this->release();
throw new \coding_exception("A lock was created but not released at:\n" .
$this->caller . "\n\n" .
" Code should look like:\n\n" .
" \$factory = \core\lock\lock_config::get_lock_factory('type');\n" .
" \$lock = \$factory->get_lock($key);\n" .
" \$lock->release(); // Locks must ALWAYS be released like this.\n\n");
if ($withexception) {
throw new \core\exception\coding_exception(<<<EOF
A lock was created but not released at: {$this->caller}
Code should look like:
\$factory = \core\lock\lock_config::get_lock_factory('type');
\$lock = \$factory->get_lock($key);
\$lock->release(); // Locks must ALWAYS be released like this.
EOF);
}
}
}
/**
* Print debugging if this lock falls out of scope before being released.
*/
public function __destruct() {
$this->release_if_not_released(defined('PHPUNIT_TEST'));
}
}
+2 -2
View File
@@ -685,8 +685,8 @@ abstract class advanced_testcase extends base_testcase {
$params['userid'] = $matchuserid;
}
$lock = $this->createMock(\core\lock\lock::class);
$cronlock = $this->createMock(\core\lock\lock::class);
$lock = $this->createStub(\core\lock\lock::class);
$cronlock = $this->createStub(\core\lock\lock::class);
$tasks = $DB->get_recordset('task_adhoc', $params);
foreach ($tasks as $record) {