Index: openacs-4/packages/workflow/tcl/test/workflow-test-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/workflow/tcl/test/workflow-test-procs.tcl,v
diff -u -r1.18 -r1.19
--- openacs-4/packages/workflow/tcl/test/workflow-test-procs.tcl	14 Oct 2013 17:59:52 -0000	1.18
+++ openacs-4/packages/workflow/tcl/test/workflow-test-procs.tcl	29 Dec 2017 11:36:39 -0000	1.19
@@ -471,8 +471,7 @@
 } {
     set error_p [catch $test_chunk errMsg]
 
-    global errorInfo
-    set setup_error_stack $errorInfo
+    set setup_error_stack $::errorInfo
 
     # Teardown
     eval $teardown_chunk
@@ -592,7 +591,7 @@
         # 1. Make sure the cache is populated
         set dummy [workflow::case::get_element -case_id $case_id -element state_short_name]
 
-        with_catch errmsg {
+        ad_try {
 
             # 2. Stub the cache proc
             aa_stub workflow::case::fsm::get_info_not_cached {
@@ -632,16 +631,14 @@
             set i_got_called_p 0
             set dummy [workflow::case::get_element -case_id $case_id -element state_short_name]
             aa_true "Check that the value is NOT in the cache (2nd time)" $i_got_called_p
-        } {
-            aa_unstub workflow::case::fsm::get_info_not_cached
-            
-            global errorInfo
-            error $errmsg $errorInfo
-        }
-        
-        # 10. Unstub
-        aa_unstub workflow::case::fsm::get_info_not_cached
 
+        } on error {errorMsg} {
+            error $errorMsg $::errorInfo
+        } finally {
+	    # 10. Unstub
+	    aa_unstub workflow::case::fsm::get_info_not_cached
+	}
+
         
         #####
         #
@@ -674,8 +671,7 @@
     workflow::test::workflow_teardown
 
     if { $error_p } {    
-        global errorInfo
-        aa_false "error during setup: $errMsg - $errorInfo" $error_p
+        aa_false "error during setup: $errMsg - $::errorInfo" $error_p
     }
 }
 
@@ -730,8 +726,7 @@
     }
 
     if { $error_p } {    
-        global errorInfo
-        aa_false "error during setup: $errMsg - $errorInfo" $error_p
+        aa_false "error during setup: $errMsg - $::errorInfo" $error_p
     }
 }