From: Ian Jackson <ian.jackson@eu.citrix.com>
Date: Wed, 28 Oct 2015 16:49:42 +0000 (+0000)
Subject: Testing: autotest: Move some code about
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=cgi-auth-flexible.git;a=commitdiff_plain;h=48521dbb3f433c4a63df6564c4f095555a2dee95

Testing: autotest: Move some code about

No functional change.

Signed-off-by: Ian Jackson <Ian.Jackson@eu.citrix.com>
---

diff --git a/tests/autotest b/tests/autotest
index fd3b732..4ba46dc 100755
--- a/tests/autotest
+++ b/tests/autotest
@@ -14,15 +14,6 @@ set env(TERM) vt100
 log_user 0
 log_file -a $tt/expect.log
 
-proc dospawn {} {
-     global pwd spawn_id
-
-     spawn -nottycopy \
-     w3m -config /dev/null -o cgi_bin=$pwd/tests file:///cgi-bin/wrap/Tsuffix
-}
-
-dospawn
-
 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"
@@ -47,7 +38,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"
@@ -66,6 +64,8 @@ proc loginas {user {password sesame} {wanttxt ACCESSGRANTED}} {
      submitform-expect $wanttxt
 }
 
+dospawn
+
 loginas alice bogus "wrong password"
 
 loginas alice