[Bash-completion-commits] [SCM] bash-completion branch, master, updated. f615d17cb6c354c7dbb5678618fc1a22e3cab24f
Freddy Vulto
fvulto at gmail.com
Thu Jul 16 20:52:59 UTC 2009
The following commit has been merged in the master branch:
commit 2d905413fb676d22da075f26cdc2826ddb6b8781
Author: Freddy Vulto <fvulto at gmail.com>
Date: Thu Jul 16 22:47:44 2009 +0200
(testsuite) Removed local short timeout values
The local timeout settings `-timeout 1' in some loops seemed to cause
inpredictable results, e.g. with `./runCompletion dkpg.exp' since this
test has a long list to match. Sometimes the `spawn_id' was gone before
the `teardown' method was called.
Removing the short timeout seems to give more predictable results.
diff --git a/test/lib/library.exp b/test/lib/library.exp
index b152ffb..f6f5636 100644
--- a/test/lib/library.exp
+++ b/test/lib/library.exp
@@ -125,10 +125,7 @@ proc assert_complete_any {cmd {test ""} {prompt /@}} {
expect -ex "$cmd"
# Escape special regexp characters
regsub -all {([\[\]\(\)\.\\\+])} $cmd {\\\1} cmd
- # NOTE: A timeout of 1 is used to match quicker when no completion are
- # returned. E.g. within `cancel.exp' when no print jobs are available.
expect {
- -timeout 1
-re "^\r\n.*$prompt$cmd$" { pass "$test" }
-re /@ { unresolved "$test at prompt" }
-re eof { unresolved "eof" }
@@ -253,7 +250,6 @@ proc match_items {items test {size 20}} {
}; # for
if {[llength $items] == 1} {
expect {
- -timeout 1
-re "$expected" { set result true }
"\r\n" { set result false; break }
default { set result false; break }
@@ -261,7 +257,6 @@ proc match_items {items test {size 20}} {
}; # expect
} else {
expect {
- -timeout 1
-re "$expected" { set result true }
default { set result false; break }
timeout { set result false; break }
--
bash-completion
More information about the Bash-completion-commits
mailing list