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 -r1.47.2.12 -r1.47.2.13
--- openacs-4/packages/acs-automated-testing/acs-automated-testing.info 20 Aug 2024 09:15:07 -0000 1.47.2.12
+++ openacs-4/packages/acs-automated-testing/acs-automated-testing.info 25 Aug 2024 10:10:43 -0000 1.47.2.13
@@ -7,7 +7,7 @@
t
t
-
+
OpenACS
The interface to the automated testing facilities within OpenACS.
2022-06-26
@@ -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 -r1.79.2.78 -r1.79.2.79
--- openacs-4/packages/acs-automated-testing/tcl/aa-test-procs.tcl 25 Aug 2024 08:47:03 -0000 1.79.2.78
+++ openacs-4/packages/acs-automated-testing/tcl/aa-test-procs.tcl 25 Aug 2024 10:10:43 -0000 1.79.2.79
@@ -11,8 +11,6 @@
@author Peter Harper (peter.harper@open-msg.com)
@creation-date 21 June 2001
-
- @cvs-id $Id$
}
#
@@ -2488,8 +2486,28 @@
}
}
+ad_proc -public aa_silence_log_entries {
+ -severities:required
+ code
+} {
+ Silence expected messages in the system log. The proc deactivates
+ the specified severity levels during the code in the last arguemnt
+ is executed. After it has finished, the severity levels are reset
+ to their previous values.
+} {
+ set old_severity_values [lmap severity $severities {ns_logctl severity $severity 0}]
+ try {
+ set result [uplevel $code]
+ } finally {
+ foreach severity $severities old_severity_value $old_severity_values {
+ ns_logctl severity $severity $old_severity_value
+ }
+ }
+ return $result
+}
+
ad_proc -private aa_selenium_init {} {
Setup a global Selenium RC server connection
Index: openacs-4/packages/acs-automated-testing/tcl/test/acs-automated-testing-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-automated-testing/tcl/test/acs-automated-testing-procs.tcl,v
diff -u -r1.10.2.16 -r1.10.2.17
--- openacs-4/packages/acs-automated-testing/tcl/test/acs-automated-testing-procs.tcl 20 Aug 2024 09:15:07 -0000 1.10.2.16
+++ openacs-4/packages/acs-automated-testing/tcl/test/acs-automated-testing-procs.tcl 25 Aug 2024 10:10:43 -0000 1.10.2.17
@@ -26,6 +26,7 @@
acs::test::url
aa_check_leftovers
+ aa_silence_log_entries
aa_register_case
aa_runseries
aa_test_end
Index: openacs-4/packages/acs-lang/acs-lang.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/acs-lang.info,v
diff -u -r1.64.2.22 -r1.64.2.23
--- openacs-4/packages/acs-lang/acs-lang.info 8 Aug 2024 12:19:07 -0000 1.64.2.22
+++ openacs-4/packages/acs-lang/acs-lang.info 25 Aug 2024 10:10:43 -0000 1.64.2.23
@@ -9,7 +9,7 @@
f
t
-
+
Peter Marklund
OpenACS Internationalization Support.
2023-05-09
@@ -20,13 +20,14 @@
GPL
3
-
+
+
Index: openacs-4/packages/acs-lang/tcl/test/acs-lang-test-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/tcl/test/acs-lang-test-procs.tcl,v
diff -u -r1.28.2.32 -r1.28.2.33
--- openacs-4/packages/acs-lang/tcl/test/acs-lang-test-procs.tcl 24 Aug 2024 14:59:50 -0000 1.28.2.32
+++ openacs-4/packages/acs-lang/tcl/test/acs-lang-test-procs.tcl 25 Aug 2024 10:10:44 -0000 1.28.2.33
@@ -324,9 +324,9 @@
# Import the catalog file
array unset message_count
- ns_logctl severity error 0
- array set message_count [lang::catalog::import -package_key $package_key -locales [list $locale]]
- ns_logctl severity error 1
+ aa_silence_log_entries -severities {error} {
+ array set message_count [lang::catalog::import -package_key $package_key -locales [list $locale]]
+ }
aa_log "Imported messages: [array get message_count]"
# Check that we have the expected messages in the database
@@ -1064,6 +1064,7 @@
lang::test::setup_test_package
lang::test::teardown_test_package
+ aa_silence_log_entries
apm_package_info_file_path
apm_package_register
apm_package_install_version
Index: openacs-4/packages/search/search.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/search/search.info,v
diff -u -r1.46.2.9 -r1.46.2.10
--- openacs-4/packages/search/search.info 13 Jul 2023 13:13:58 -0000 1.46.2.9
+++ openacs-4/packages/search/search.info 25 Aug 2024 10:10:44 -0000 1.46.2.10
@@ -9,7 +9,7 @@
f
t
-
+
OpenACS
Site wide search
2022-03-01
@@ -18,10 +18,11 @@
GPL version 2
3
-
+
+
Index: openacs-4/packages/search/tcl/test/search-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/search/tcl/test/search-procs.tcl,v
diff -u -r1.1.2.11 -r1.1.2.12
--- openacs-4/packages/search/tcl/test/search-procs.tcl 24 Aug 2024 13:21:36 -0000 1.1.2.11
+++ openacs-4/packages/search/tcl/test/search-procs.tcl 25 Aug 2024 10:10:44 -0000 1.1.2.12
@@ -156,13 +156,11 @@
}
}
- ns_logctl severity notice 0
- ns_logctl severity "Debug(sql)" 0
- aa_true "Invalid event throws an error" [catch {
- search::queue -object_id $object_id -event BOGUS
- }]
- ns_logctl severity "Debug(sql)" 1
- ns_logctl severity notice 1
+ aa_silence_log_entries -severities {error notice} {
+ aa_true "Invalid event throws an error" [catch {
+ search::queue -object_id $object_id -event BOGUS
+ }]
+ }
}
aa_register_case \