1 files changed, 18 insertions, 27 deletions
diff --git a/tests/bgerror.test b/tests/bgerror.test
index fd9594a..fa33d31 100644
--- a/tests/bgerror.test
+++ b/tests/bgerror.test
@@ -5,58 +5,49 @@
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 # All rights reserved.
 
-package require tcltest 2.2
-namespace import ::tcltest::*
+package require tcltest 2.1
 eval tcltest::configure $argv
 tcltest::loadTestedCommands
 
-test bgerror-1.1 {bgerror / tkerror compat} -setup {
+test bgerror-1.1 {bgerror / tkerror compat} {
     set errRes {}
     proc tkerror {err} {
-        global errRes;
-        set errRes $err;
+	global errRes;
+	set errRes $err;
     }
-} -body {
     after 0 {error err1}
     vwait errRes;
-    return $errRes;
-} -cleanup {
-    catch {rename tkerror {}}
-} -result {err1}
+    set errRes;
+} err1
 
-test bgerror-1.2 {bgerror / tkerror compat / accumulation} -setup {
+test bgerror-1.2 {bgerror / tkerror compat / accumulation} {
     set errRes {}
     proc tkerror {err} {
-        global errRes;
-        lappend errRes $err;
+	global errRes;
+	lappend errRes $err;
     }
-} -body {
     after 0 {error err1}
     after 0 {error err2}
     after 0 {error err3}
     update
-    return $errRes;
-} -cleanup {
-    catch {rename tkerror {}}
-} -result {err1 err2 err3}
+    set errRes;
+} {err1 err2 err3}
 
-test bgerror-1.3 {bgerror / tkerror compat / accumulation / break} -setup {
+test bgerror-1.3 {bgerror / tkerror compat / accumulation / break} {
     set errRes {}
     proc tkerror {err} {
-        global errRes;
-        lappend errRes $err;
-        return -code break "skip!";
+	global errRes;
+	lappend errRes $err;
+	return -code break "skip!";
     }
-} -body {
     after 0 {error err1}
     after 0 {error err2}
     after 0 {error err3}
     update
-    return $errRes;
-} -cleanup {
-    catch {rename tkerror {}}
-} -result {err1}
+    set errRes;
+} err1
 
+catch {rename tkerror {}}
 
 # some testing of the default error dialog
 # would be needed too, but that's not easy at all