From 0224ac164a76ea4e7643fc44507024b5bb26c77d Mon Sep 17 00:00:00 2001
From: dgp <dgp@users.sourceforge.net>
Date: Tue, 7 Oct 2003 16:37:41 +0000
Subject:         * tests/pid.test:       Corrected temporary file management
 issues         uncovered by -debug 1 test operations. [Bug 675655]

---
 ChangeLog      |  3 +++
 tests/pid.test | 27 ++++++++++++++++-----------
 2 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index db1d3e8..5b70790 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2003-10-07  Don Porter  <dgp@users.sourceforge.net>
 
+        * tests/pid.test:       Corrected temporary file management issues
+        uncovered by -debug 1 test operations. [Bug 675655]
+
         * tests/fCmd.test:      Run tests with the [temporaryDirectory] as
         the current directory, so that tests can depend on ability to write
         files.  [Bug 575837]
diff --git a/tests/pid.test b/tests/pid.test
index 0bc3d24..613d01f 100644
--- a/tests/pid.test
+++ b/tests/pid.test
@@ -11,10 +11,10 @@
 # See the file "license.terms" for information on usage and redistribution
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 #
-# RCS: @(#) $Id: pid.test,v 1.8 2003/02/25 22:03:45 andreas_kupries Exp $
+# RCS: @(#) $Id: pid.test,v 1.9 2003/10/07 16:37:41 dgp Exp $
 
 if {[lsearch [namespace children] ::tcltest] == -1} {
-    package require tcltest
+    package require tcltest 2
     namespace import -force ::tcltest::*
 }
 
@@ -26,27 +26,33 @@ if {[info commands pid] == ""} {
     return
 }
 
-catch {removeFile test1}
-set path(test1) [makeFile {} test1]
-
 test pid-1.1 {pid command} {
     regexp {(^[0-9]+$)|(^0x[0-9a-fA-F]+$)} [pid]
 } 1
-test pid-1.2 {pid command} {unixOrPc unixExecs} {
+test pid-1.2 {pid command} -constraints {unixOrPc unixExecs} -setup {
+    set path(test1) [makeFile {} test1]
+    file delete $path(test1)
+} -body {
     set f [open [format {| echo foo | cat {>%s}} $path(test1)] w]
     set pids [pid $f]
     close $f
-    catch {removeFile test1}
     list [llength $pids] [regexp {^[0-9]+$} [lindex $pids 0]] \
        [regexp {^[0-9]+$} [lindex $pids 1]] \
        [expr {[lindex $pids 0] == [lindex $pids 1]}]
-} {2 1 1 0}
-test pid-1.3 {pid command} {
+} -cleanup {
+    removeFile test1
+} -result {2 1 1 0}
+test pid-1.3 {pid command} -setup {
+    set path(test1) [makeFile {} test1]
+    file delete $path(test1)
+} -body {
     set f [open $path(test1) w]
     set pids [pid $f]
     close $f
     set pids
-} {}
+} -cleanup {
+    removeFile test1
+} -result {}
 test pid-1.4 {pid command} {
     list [catch {pid a b} msg] $msg
 } {1 {wrong # args: should be "pid ?channelId?"}}
@@ -55,7 +61,6 @@ test pid-1.5 {pid command} {
 } {1 {can not find channel named "gorp"}}
 
 # cleanup
-catch {::tcltest::removeFile test1}
 ::tcltest::cleanupTests
 return
 
-- 
cgit v0.12