X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?a=blobdiff_plain;f=tests%2Fautotest;h=b3118d32047bc413eba482da362444a6bafa2a0f;hb=352a6b4904774e3368a4ed1dbccc28787d942bc5;hp=43f4080ceae9ac5672da4f0992595289e02c1f4c;hpb=4848e0d386cf626b2179aeda2582a53cb07b9e50;p=cgi-auth-flexible.git

diff --git a/tests/autotest b/tests/autotest
index 43f4080..b3118d3 100755
--- a/tests/autotest
+++ b/tests/autotest
@@ -1,5 +1,7 @@
 #!/usr/bin/expect -f
 
+set testfile [lindex $argv 0]
+
 set tt tests/tmp
 
 exec rm -rf $tt
@@ -10,13 +12,11 @@ set pwd [pwd]
 set env(HOME) $tt
 set env(CAFTEST_CAF) $pwd
 set env(TERM) vt100
+set env(CAFTEST_NOSRCDUMP) 1
 
 log_user 0
 log_file -a $tt/expect.log
 
-spawn -nottycopy \
-w3m -config /dev/null -o cgi_bin=$pwd/tests file:///cgi-bin/wrap/Tsuffix
-
 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"
@@ -41,7 +41,14 @@ proc epage {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
+
+     epage {You need to log in}
+}
 
 proc fillformfield {value} {
     send "\t\r$value\r"
@@ -53,16 +60,13 @@ proc submitform-expect {wanttxt} {
     epage $wanttxt
 }
 
-fillformfield alice
-fillformfield bogus
-send "\t"
-submitform-expect "wrong password"
-
-fillformfield alice
-fillformfield sesame
-send "\t"
-submitform-expect "ACCESSGRANTED"
+proc loginas {user {password sesame} {wanttxt ACCESSGRANTED}} {
+     fillformfield $user
+     fillformfield $password
+     send "\t"
+     submitform-expect $wanttxt
+}
 
-etxt {path = '/Tsuffix'}
+source $testfile
 
 puts ok