Testing: Move expect_before timeout to right place

[cgi-auth-flexible.git] / tests / autotest

diff --git a/tests/autotest b/tests/autotest
index 40d6a5728a1182b53469f07d7b8cb2c823130733..60ef3ffce6357007db3af862c2a4affcd27fbdbb 100755 (executable)
--- a/tests/autotest
+++ b/tests/autotest
@@ -1,29 +1,37 @@
 #!/usr/bin/expect -f
 
-set tt tests/tmp
+set testfile [lindex $argv 0]
+
+switch -glob -- $testfile {
+    tests/*.at {
+       regsub {^tests/} $testfile {tests/tmp/} tt
+       regsub {\.at$} $tt {} tt
+    }
+    * {
+       set tt tests/tmp/[info pid]
+    }
+}
 
 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 env(CAFTEST_TMP) $pwd/$tt
 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
 
-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"
 }
-set timeout 5
-
-expect_after timeout timeout-abort
+set timeout 10
 
 proc elog {args} {
      set m "[list expect [lindex $args end]]"
@@ -41,7 +49,16 @@ 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
+
+     expect_after timeout timeout-abort
+
+     epage {You need to log in}
+}
 
 proc fillformfield {value} {
     send "\t\r$value\r"
@@ -60,32 +77,6 @@ proc loginas {user {password sesame} {wanttxt ACCESSGRANTED}} {
      submitform-expect $wanttxt
 }
 
-loginas alice bogus "wrong password"
-
-loginas alice
-
-etxt {path = '/Tsuffix'}
-
-send "/Make worms\r"
-submitform-expect "MAKING-worms"
-
-send "/Logout\r"
-submitform-expect "You have been logged out"
-
-send "B\x10/Make sponges\r"
-submitform-expect "You need to log in"
-
-loginas bob
-
-send "/Logout\r"
-submitform-expect "You have been logged out"
-
-send "/Log in again\r"
-submitform-expect "need to log in"
-
-loginas bob
-
-send "BBB\x10/Make sponges\r"
-submitform-expect "Login session interrupted"
+source $testfile
 
 puts ok