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

Unit tests MDL-24981 Fixed portfolio unit test so it at least runs (albeit with 23 exceptions and only 2 passes)

Browse Source
This commit is contained in:
Sam Marshall
2010-11-01 18:00:57 +00:00
parent 157434a522
commit bf81b16824
4 changed files with 40 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/portfolio/exceptions.php
+24 -9
View File
@@ -49,18 +49,33 @@ class portfolio_export_exception extends portfolio_exception {
*/
public function __construct($exporter, $errorcode, $module=null, $continue=null, $a=null) {
global $CFG;
// This static variable is necessary because sometimes the code below
// which tries to obtain a continue link can cause one of these
// exceptions to be thrown. This would create an infinite loop (until
// PHP hits its stack limit). Using this static lets us make the
// nested constructor finish immediately without attempting to call
// methods that might fail.
static $inconstructor = false;
if (!empty($exporter) && $exporter instanceof portfolio_exporter) {
if (empty($continue)) {
$caller = $exporter->get('caller');
if (!empty($caller) && $caller instanceof portfolio_caller_base) {
$continue = $exporter->get('caller')->get_return_url();
if (!$inconstructor && !empty($exporter) &&
$exporter instanceof portfolio_exporter) {
$inconstructor = true;
try {
if (empty($continue)) {
$caller = $exporter->get('caller');
if (!empty($caller) && $caller instanceof portfolio_caller_base) {
$continue = $exporter->get('caller')->get_return_url();
}
}
// this was previously only called if we were in cron,
// but I think if there's always an exception, we should clean up
// rather than force the user to resolve the export later.
$exporter->process_stage_cleanup();
} catch(Exception $e) {
// Ooops, we had an exception trying to get caller
// information. Ignore it.
}
// this was previously only called if we were in cron,
// but I think if there's always an exception, we should clean up
// rather than force the user to resolve the export later.
$exporter->process_stage_cleanup();
$inconstructor = false;
}
parent::__construct($errorcode, $module, $continue, $a);
}