L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MDL-86113 mod_lti: skip slow network calls during tests

Browse Source 
This check exists to determine whether a given tool URL is a cartridge,
specifically when the URL does not end in .xml. It hits the URL to
determine this. In tests, we have many mock tool URLs, which won't
resolve, and running this code causes large hangs and random failures.
Any tests covering cartridge support still work fine, provided they
continue to use URLs ending in .xml; this change only skips the check
during tests for other non-xml URLs.
This commit is contained in:
Jake Dallimore
2025-07-25 16:55:27 +08:00
parent a1e5573ee8
commit 8a30246613
1 changed files with 19 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
public/mod/lti/locallib.php
+19 -11
View File
@@ -4356,18 +4356,26 @@ function lti_is_cartridge($url) {
if (preg_match('/\.xml$/', $url)) {
return true;
}
// Even if it doesn't have .xml, load the url to check if it's a cartridge..
try {
$toolinfo = lti_load_cartridge($url,
array(
"launch_url" => "launchurl"
)
);
if (!empty($toolinfo['launchurl'])) {
return true;
// Skip slow cartridge checks during tests.
// During tests, working .xml cartridge URLs are used when testing cartridge support. These will match the '.xml' check
// above (which is fast). Don't try to check whether other tool URLs are cartridges because most URLs used in tests will be
// example URLs and won't be resolvable, resulting in network hangs within load_cartridge() - which is called every time a
// tool is edited and will result in slow tests or seemingly random test failures.
if (!defined('BEHAT_SITE_RUNNING') && !defined('PHPUNIT_TEST')) {
// Even if it doesn't have .xml, load the url to check if it's a cartridge..
try {
$toolinfo = lti_load_cartridge($url,
array(
"launch_url" => "launchurl"
)
);
if (!empty($toolinfo['launchurl'])) {
return true;
}
} catch (moodle_exception $e) {
return false; // Error loading the xml, so it's not a cartridge.
}
} catch (moodle_exception $e) {
return false; // Error loading the xml, so it's not a cartridge.
}
return false;
}