1 files changed, 20 insertions, 35 deletions
diff --git a/tests/pid.test b/tests/pid.test
index 0bc3d24..d21dbaa 100644
--- a/tests/pid.test
+++ b/tests/pid.test
@@ -10,63 +10,48 @@
 #
 # 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 $
 
 if {[lsearch [namespace children] ::tcltest] == -1} {
-    package require tcltest
+    package require tcltest 2
     namespace import -force ::tcltest::*
 }
 
-# If pid is not defined just return with no error
-# Some platforms may not have the pid command implemented
-if {[info commands pid] == ""} {
-    puts "pid is not implemented for this machine"
-    ::tcltest::cleanupTests
-    return
-}
-
-catch {removeFile test1}
-set path(test1) [makeFile {} test1]
+testConstraint pidDefined [llength [info commands pid]]
 
-test pid-1.1 {pid command} {
+test pid-1.1 {pid command} pidDefined {
     regexp {(^[0-9]+$)|(^0x[0-9a-fA-F]+$)} [pid]
 } 1
-test pid-1.2 {pid command} {unixOrPc unixExecs} {
-    set f [open [format {| echo foo | cat {>%s}} $path(test1)] w]
+test pid-1.2 {pid command} -constraints {unixOrPc unixExecs pidDefined} -setup {
+    set path(test1) [makeFile {} test1]
+    file delete $path(test1)
+} -body {
+    set f [open |[list echo foo | cat >$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} -constraints pidDefined -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
-} {}
-test pid-1.4 {pid command} {
+} -cleanup {
+    removeFile test1
+} -result {}
+test pid-1.4 {pid command} pidDefined {
     list [catch {pid a b} msg] $msg
 } {1 {wrong # args: should be "pid ?channelId?"}}
-test pid-1.5 {pid command} {
+test pid-1.5 {pid command} pidDefined {
     list [catch {pid gorp} msg] $msg
 } {1 {can not find channel named "gorp"}}
 
 # cleanup
-catch {::tcltest::removeFile test1}
 ::tcltest::cleanupTests
 return
-
-
-
-
-
-
-
-
-
-
-
-