Index: openacs-4/packages/acs-automated-testing/tcl/aa-test-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-automated-testing/tcl/aa-test-procs.tcl,v diff -u -r1.79.2.74 -r1.79.2.75 --- openacs-4/packages/acs-automated-testing/tcl/aa-test-procs.tcl 18 Jul 2024 08:44:52 -0000 1.79.2.74 +++ openacs-4/packages/acs-automated-testing/tcl/aa-test-procs.tcl 18 Jul 2024 10:05:03 -0000 1.79.2.75 @@ -665,7 +665,9 @@ # foreach testcase_id $testcase_ids { ns_log notice "========================================= start $testcase_id (Errors: [dict get [ns_logctl stats] Error])" + aa_test_start aa_run_testcase $testcase_id + aa_test_end ns_log notice "========================================= end $testcase_id (Errors: [dict get [ns_logctl stats] Error])" } Index: openacs-4/packages/acs-bootstrap-installer/tcl/00-proc-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-bootstrap-installer/tcl/00-proc-procs.tcl,v diff -u -r1.66.2.32 -r1.66.2.33 --- openacs-4/packages/acs-bootstrap-installer/tcl/00-proc-procs.tcl 5 Apr 2024 08:39:20 -0000 1.66.2.32 +++ openacs-4/packages/acs-bootstrap-installer/tcl/00-proc-procs.tcl 18 Jul 2024 10:05:03 -0000 1.66.2.33 @@ -1003,7 +1003,7 @@ # During initial startup, a callback implementation might # not be loaded yet. Ignore the callback invocation, but # inform the admin in the system log about it. - # + # ns_log notice "callback invocation $callback during startup ignored. " \ "The callback implementation might not be loaded yet." } else { @@ -1025,7 +1025,14 @@ } 1 { # code error - either rethrow the current error or log if {$catch_p} { - ns_log Error "callback $callback error invoking $procname: $ret\n[ad_print_stack_trace]\n" + set msg "callback $callback error invoking $procname: $ret" + if {[aa_test_running_p]} { + set severity warning + } else { + set severity error + append msg \n[ad_print_stack_trace] + } + ns_log $severity $msg } else { return -code $c -errorcode $::errorCode -errorinfo $::errorInfo $ret } @@ -1056,7 +1063,7 @@ ad_proc ad_log_deprecated {what oldCmd {newCmd ""}} { - + Provide a standardized interface for reporting deprecated ad_procs or other artifacts. In some situations, the flag "-deprecated" in the proc is not sufficient. When "newCmd" is not specified, this @@ -1066,7 +1073,7 @@ @param what type of artifact being used (e.g. "proc" or "class") @param oldCmd the name of the deprecated command @param newCmd replacement command, when specified - + } { set msg "*** $what $oldCmd is deprecated." if {$newCmd eq "" && $what eq "proc"} { @@ -1085,7 +1092,7 @@ } if {$newCmd ne ""} { append msg " Use '$newCmd' instead." - } + } ns_log warning "$msg\n[uplevel ad_get_tcl_call_stack]" } Index: openacs-4/packages/acs-tcl/tcl/apm-xml-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/apm-xml-procs.tcl,v diff -u -r1.33.2.9 -r1.33.2.10 --- openacs-4/packages/acs-tcl/tcl/apm-xml-procs.tcl 30 Mar 2021 15:41:19 -0000 1.33.2.9 +++ openacs-4/packages/acs-tcl/tcl/apm-xml-procs.tcl 18 Jul 2024 10:05:03 -0000 1.33.2.10 @@ -363,10 +363,15 @@ } if {$type ni [apm_supported_callback_types]} { - # The callback type is not supported - ns_log Error "package info file $path contains an unsupported\ - callback type $type - ignoring. Valid values are\ - [apm_supported_callback_types]" + # + # The callback type is not supported. Report an error + # unelss when this happens in the regression test, + # where the error condition is tested. + # + set severity [expr {[aa_test_running_p] ? "warning" : "error"}] + ns_log $severity "package info file $path contains an unsupported" \ + "callback type '$type' - ignoring. Valid values are" \ + [apm_supported_callback_types] continue } Index: openacs-4/packages/acs-tcl/tcl/text-html-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/text-html-procs.tcl,v diff -u -r1.109.2.59 -r1.109.2.60 --- openacs-4/packages/acs-tcl/tcl/text-html-procs.tcl 17 Jul 2024 12:53:21 -0000 1.109.2.59 +++ openacs-4/packages/acs-tcl/tcl/text-html-procs.tcl 18 Jul 2024 10:05:03 -0000 1.109.2.60 @@ -1621,16 +1621,21 @@ dom parse -html "${lmarker}${html}${rmarker}" doc } on error {errorMsg} { - set severity [expr {$validate_p ? "notice" : "error"}] + set severity [expr {$validate_p ? "notice" : "warning"}] if {$fix_p} { try { set doc [ad_dom_fix_html -html $html -dom] } on error {errorMsg} { - ad_log $severity "Fixing of the document failed. Reported error: $errorMsg" + if {![aa_test_running_p]} { + ad_log $severity "Fixing of the document failed. Reported error: $errorMsg" + } return [expr {$validate_p ? 0 : ""}] } } else { - ad_log $severity "Parsing of the document failed. Reported error: $errorMsg" + #ns_log notice "PARSING of\n${lmarker}${html}${rmarker}\n FAILED" + if {![aa_test_running_p]} { + ad_log $severity "Parsing of the document failed. Reported error: $errorMsg" + } return [expr {$validate_p ? 0 : ""}] } } @@ -1745,7 +1750,6 @@ # information from our current location. # set url [ns_absoluteurl $url $current_location] - if {$no_outer_urls_p && [util::external_url_p $url]} { if {$validate_p} { #