summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorKevin B Kenny <kennykb@acm.org>2003-02-01 21:07:28 (GMT)
committerKevin B Kenny <kennykb@acm.org>2003-02-01 21:07:28 (GMT)
commitba1f1f1fd02bbc394411bd61da4b5dcf87439b60 (patch)
treec03fc05b0aadf3d371658d048d5a285296cafda8 /tests
parentb6d2ba95de66b5c89d10d8861df1b8d02ec7dcc2 (diff)
downloadtcl-ba1f1f1fd02bbc394411bd61da4b5dcf87439b60.zip
tcl-ba1f1f1fd02bbc394411bd61da4b5dcf87439b60.tar.gz
tcl-ba1f1f1fd02bbc394411bd61da4b5dcf87439b60.tar.bz2
* tests/unixNotfy.test: Added cleanup of working files
[Bug 675609]
Diffstat (limited to 'tests')
-rw-r--r--tests/unixNotfy.test126
1 files changed, 79 insertions, 47 deletions
diff --git a/tests/unixNotfy.test b/tests/unixNotfy.test
index e8c90c8..8e776cc 100644
--- a/tests/unixNotfy.test
+++ b/tests/unixNotfy.test
@@ -10,7 +10,7 @@
# See the file "license.terms" for information on usage and redistribution
# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
#
-# RCS: @(#) $Id: unixNotfy.test,v 1.10 2002/07/05 10:38:43 dkf Exp $
+# RCS: @(#) $Id: unixNotfy.test,v 1.11 2003/02/01 21:07:28 kennykb Exp $
# The tests should not be run if you have a notifier which is unable to
# detect infinite vwaits, as the tests below will hang. The presence of
@@ -34,57 +34,89 @@ set ::tcltest::testConstraints(testthread) \
# will not necessarily wait for ever in this case, so it does not generate
# an error.
-test unixNotfy-1.1 {Tcl_DeleteFileHandler} {unixOnly && !testthread} {
- catch {vwait x}
- set f [open [makeFile "" foo] w]
- fileevent $f writable {set x 1}
- vwait x
- close $f
- list [catch {vwait x} msg] $msg
-} {1 {can't wait for variable "x": would wait forever}}
-test unixNotfy-1.2 {Tcl_DeleteFileHandler} {unixOnly && !testthread} {
- catch {vwait x}
- set f1 [open [makeFile "" foo] w]
- set f2 [open [makeFile "" foo2] w]
- fileevent $f1 writable {set x 1}
- fileevent $f2 writable {set y 1}
- vwait x
- close $f1
- vwait y
- close $f2
- list [catch {vwait x} msg] $msg
-} {1 {can't wait for variable "x": would wait forever}}
+test unixNotfy-1.1 {Tcl_DeleteFileHandler} \
+ -constraints {unixOnly && !testthread} \
+ -body {
+ catch {vwait x}
+ set f [open [makeFile "" foo] w]
+ fileevent $f writable {set x 1}
+ vwait x
+ close $f
+ list [catch {vwait x} msg] $msg
+ } \
+ -result {1 {can't wait for variable "x": would wait forever}} \
+ -cleanup {
+ catch { close $f }
+ catch { removeFile foo }
+ }
+test unixNotfy-1.2 {Tcl_DeleteFileHandler} \
+ -constraints {unixOnly && !testthread} \
+ -body {
+ catch {vwait x}
+ set f1 [open [makeFile "" foo] w]
+ set f2 [open [makeFile "" foo2] w]
+ fileevent $f1 writable {set x 1}
+ fileevent $f2 writable {set y 1}
+ vwait x
+ close $f1
+ vwait y
+ close $f2
+ list [catch {vwait x} msg] $msg
+ } \
+ -result {1 {can't wait for variable "x": would wait forever}} \
+ -cleanup {
+ catch { close $f1 }
+ catch { close $f2 }
+ catch { removeFile foo }
+ catch { removeFile foo2 }
+ }
-test unixNotfy-2.1 {Tcl_DeleteFileHandler} {unixOnly testthread} {
- update
- set f [open [makeFile "" foo] w]
- fileevent $f writable {set x 1}
- vwait x
- close $f
- testthread create "after 500
+test unixNotfy-2.1 {Tcl_DeleteFileHandler} \
+ -constraints {unixOnly && testthread} \
+ -body {
+ update
+ set f [open [makeFile "" foo] w]
+ fileevent $f writable {set x 1}
+ vwait x
+ close $f
+ testthread create "after 500
testthread send [testthread id] {set x ok}
testthread exit"
- vwait x
- set x
-} {ok}
-test unixNotfy-2.2 {Tcl_DeleteFileHandler} {unixOnly testthread} {
- update
- set f1 [open [makeFile "" foo] w]
- set f2 [open [makeFile "" foo2] w]
- fileevent $f1 writable {set x 1}
- fileevent $f2 writable {set y 1}
- vwait x
- close $f1
- vwait y
- close $f2
- testthread create "after 500
- testthread send [testthread id] {set x ok}
- testthread exit"
- vwait x
- set x
-} {ok}
+ vwait x
+ set x
+ } \
+ -result {ok} \
+ -cleanup {
+ catch { close $f }
+ catch { removeFile foo }
+ }
+test unixNotfy-2.2 {Tcl_DeleteFileHandler} \
+ -constraints {unixOnly && testthread} \
+ -body {
+ update
+ set f1 [open [makeFile "" foo] w]
+ set f2 [open [makeFile "" foo2] w]
+ fileevent $f1 writable {set x 1}
+ fileevent $f2 writable {set y 1}
+ vwait x
+ close $f1
+ vwait y
+ close $f2
+ testthread create "after 500
+ testthread send [testthread id] {set x ok}
+ testthread exit"
+ vwait x
+ set x
+ } \
+ -result {ok} \
+ -cleanup {
+ catch { close $f1 }
+ catch { close $f2 }
+ catch { removeFile foo }
+ catch { removeFile foo2 }
+ }
# cleanup
::tcltest::cleanupTests