chiark
/
gitweb
/
~ian
/
cgi-auth-flexible.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Testing: autotest: Print id in log messages
[cgi-auth-flexible.git]
/
tests
/
autotest
diff --git
a/tests/autotest
b/tests/autotest
index 29863bca319e34197e17cb6220731e2786ae6512..1cea707f8df1a4263a988a6196659c0acd8f6cee 100755
(executable)
--- a/
tests/autotest
+++ b/
tests/autotest
@@
-1,33
+1,44
@@
#!/usr/bin/expect -f
#!/usr/bin/expect -f
-set tt tests/tmp
+set testfile [lindex $argv 0]
+
+switch -glob -- $testfile {
+ tests/*.at {
+ regsub {^tests/} $testfile {} id
+ regsub {\.at$} $id {} id
+ set tt "tests/tmp/$id"
+ }
+ * {
+ set id "\[[info pid]\]"
+ set tt tests/tmp/[info pid]
+ }
+}
exec rm -rf $tt
exec rm -rf $tt
-
exec mkdir
$tt
+
file mkdir tests/tmp
$tt
set pwd [pwd]
set env(HOME) $tt
set env(CAFTEST_CAF) $pwd
set pwd [pwd]
set env(HOME) $tt
set env(CAFTEST_CAF) $pwd
+set env(CAFTEST_TMP) $pwd/$tt
set env(TERM) vt100
set env(TERM) vt100
+set env(CAFTEST_NOSRCDUMP) 1
+set env(LC_ALL) en_GB.utf-8
log_user 0
log_file -a $tt/expect.log
log_user 0
log_file -a $tt/expect.log
-spawn -nottycopy \
-w3m -config /dev/null -o cgi_bin=$pwd/tests file:///cgi-bin/wrap
-
proc timeout-abort {} {
send_log "\r\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n"
proc timeout-abort {} {
send_log "\r\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n"
- error "aborting due to timeout"
+ error "
$id:
aborting due to timeout"
}
}
-set timeout 5
-
-expect_after timeout timeout-abort
+set timeout 10
proc elog {args} {
proc elog {args} {
+ global id
set m "[list expect [lindex $args end]]"
set m "[list expect [lindex $args end]]"
- puts stderr
$m
+ puts stderr
"$id: $m"
# send_log "\n$m\n"
eval expect $args
}
# send_log "\n$m\n"
eval expect $args
}
@@
-41,24
+52,34
@@
proc epage {str} {
etxt $str
}
etxt $str
}
-epage {You need to log in}
+proc dospawn {} {
+ global pwd spawn_id
+
+ spawn -nottycopy \
+ w3m -config /dev/null -o cgi_bin=$pwd/tests file:///cgi-bin/wrap/Tsuffix
+
+ expect_after timeout timeout-abort
+
+ epage {You need to log in}
+}
proc fillformfield {value} {
send "\t\r$value\r"
}
proc submitform-expect {wanttxt} {
proc fillformfield {value} {
send "\t\r$value\r"
}
proc submitform-expect {wanttxt} {
- send "\
t\
r"
+ send "\r"
etxt "loading file"
epage $wanttxt
}
etxt "loading file"
epage $wanttxt
}
-fillformfield alice
-fillformfield bogus
-submitform-expect "wrong password"
+proc loginas {user {password sesame} {wanttxt ACCESSGRANTED}} {
+ fillformfield $user
+ fillformfield $password
+ send "\t"
+ submitform-expect $wanttxt
+}
-fillformfield alice
-fillformfield sesame
-submitform-expect "ACCESSGRANTED"
+source $testfile
-puts
ok
+puts
"$id: ok"