Index: openacs-4/packages/acs-automated-testing/acs-automated-testing.info =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-automated-testing/acs-automated-testing.info,v diff -u -N -r1.47.2.9 -r1.47.2.10 --- openacs-4/packages/acs-automated-testing/acs-automated-testing.info 9 May 2022 17:05:48 -0000 1.47.2.9 +++ openacs-4/packages/acs-automated-testing/acs-automated-testing.info 26 Jun 2022 19:28:27 -0000 1.47.2.10 @@ -7,7 +7,7 @@ t t - + OpenACS The interface to the automated testing facilities within OpenACS. 2021-09-15 @@ -19,7 +19,7 @@ OpenACS system. Also provides a UI for managing automatic-rebuild servers as in a test farm. - + 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 -N -r1.79.2.59 -r1.79.2.60 --- openacs-4/packages/acs-automated-testing/tcl/aa-test-procs.tcl 9 May 2022 17:05:48 -0000 1.79.2.59 +++ openacs-4/packages/acs-automated-testing/tcl/aa-test-procs.tcl 26 Jun 2022 19:28:27 -0000 1.79.2.60 @@ -2082,6 +2082,7 @@ ad_proc ::acs::test::user::delete { {-user_id:required} + {-delete_created_acs_objects:boolean false} } { Remove a test user. } { @@ -2095,16 +2096,22 @@ SET modifying_user = NULL where modifying_user = :user_id } + # + # If desired, delete the created acs_objects of this user. + # + if {$delete_created_acs_objects_p} { + db_dml unset_modifying_user { + delete from acs_objects where creation_user = :user_id + } + } acs_user::delete \ -user_id $user_id \ -permanent } - } - namespace eval aa_test {} ad_proc -public aa_test::xml_report_dir {} { Index: openacs-4/packages/acs-automated-testing/tcl/coverage-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-automated-testing/tcl/Attic/coverage-procs.tcl,v diff -u -N -r1.1.2.13 -r1.1.2.14 --- openacs-4/packages/acs-automated-testing/tcl/coverage-procs.tcl 2 Mar 2021 09:56:40 -0000 1.1.2.13 +++ openacs-4/packages/acs-automated-testing/tcl/coverage-procs.tcl 26 Jun 2022 19:28:27 -0000 1.1.2.14 @@ -64,6 +64,7 @@ && !($proc_doc(deprecated_p) || $proc_doc(warn_p)) && ![regexp {^callback::.*::contract$} $proc_name] && ![string match xo::db::sql::* $proc_name] + && ![string match acs::db::nsdb* $proc_name] && ![string match " Class *" $proc_name] && ![string match " Object *" $proc_name] } { Index: openacs-4/packages/acs-automated-testing/www/admin/index.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-automated-testing/www/admin/index.tcl,v diff -u -N -r1.16.2.19 -r1.16.2.20 --- openacs-4/packages/acs-automated-testing/www/admin/index.tcl 20 Apr 2022 10:02:21 -0000 1.16.2.19 +++ openacs-4/packages/acs-automated-testing/www/admin/index.tcl 26 Jun 2022 19:28:27 -0000 1.16.2.20 @@ -95,6 +95,13 @@ } } else { # No category specified, add results. + set categories [lindex $results($testcase_id,$package_key) 2] + + ns_log notice "$testcase_id,$package_key categories /$categories/" + if {"stress" in $categories && !$stress} { + continue + } + incr package_total incr package_pass $passes incr package_fail $fails @@ -129,7 +136,7 @@ set proc_coverage [dict get [aa::coverage::proc_coverage -package_key $package_key] coverage] set proc_coverage_level [aa::coverage::proc_coverage_level $proc_coverage] set color [aa::percentage_to_color $proc_coverage] - #ns_log notice "view_by $view_by package_key=$package_key $proc_coverage_level $proc_coverage_color" + #ns_log notice "view_by $view_by package_key=$package_key $proc_coverage_level $color" set url [export_vars -base index -url { stress security_risk quiet @@ -157,6 +164,11 @@ foreach testcase [lsort [nsv_get aa_test cases]] { set testcase_id [lindex $testcase 0] set package_key [lindex $testcase 3] + set categories [lindex $testcase 4] + + if {"stress" in $categories && !$stress} { + continue + } lassign $results($testcase_id,$package_key) testcase_desc . categories \ testcase_timestamp testcase_passes testcase_fails testcase_warnings Index: openacs-4/packages/file-storage/file-storage.info =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/file-storage.info,v diff -u -N -r1.60.2.22 -r1.60.2.23 --- openacs-4/packages/file-storage/file-storage.info 18 Feb 2022 12:56:48 -0000 1.60.2.22 +++ openacs-4/packages/file-storage/file-storage.info 26 Jun 2022 19:28:27 -0000 1.60.2.23 @@ -7,7 +7,7 @@ f f - + OpenACS Collaborative document storage 2021-09-15 @@ -17,11 +17,11 @@ 2 #file-storage.file-storage# - + - + Index: openacs-4/packages/file-storage/tcl/test/file-storage-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/tcl/test/file-storage-procs.tcl,v diff -u -N -r1.10.2.16 -r1.10.2.17 --- openacs-4/packages/file-storage/tcl/test/file-storage-procs.tcl 9 Sep 2021 13:48:26 -0000 1.10.2.16 +++ openacs-4/packages/file-storage/tcl/test/file-storage-procs.tcl 26 Jun 2022 19:28:28 -0000 1.10.2.17 @@ -483,8 +483,9 @@ # # Get rid of the user # - aa_section "Delete test user (user_id [dict get $user_info user_id])" - acs::test::user::delete -user_id [dict get $user_info user_id] + set user_id [dict get $user_info user_id] + aa_section "Delete test user (user_id $user_id)" + acs::test::user::delete -user_id $user_id -delete_created_acs_objects } }