X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=cgi-auth-flexible.git;a=blobdiff_plain;f=tests%2Fautotest;h=4fc506835f9dc6365ccbb70b5944187160f3aabe;hp=fd3b73266f91f26f5a2894c69ad1cb3ca089aa77;hb=HEAD;hpb=83bf7d30c6ae241d0fed3136da602ef27e5cad73

diff --git a/tests/autotest b/tests/autotest
index fd3b732..4fc5068 100755
--- a/tests/autotest
+++ b/tests/autotest
@@ -1,39 +1,62 @@
 #!/usr/bin/expect -f
 
-set tt tests/tmp
+# This is part of CGI::Auth::Flexible, a perl CGI authentication module.
+#
+# Copyright 2012,2013,2015 Ian Jackson.
+# Copyright 2012,2013,2015 Citrix.
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version, with the "CAF Login Exception"
+# as published by Ian Jackson (version 1, or at your option any 
+# later version) as an Additional Permission.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+
+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 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
 
-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 {} {
+    global id
      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 15
 
 proc elog {args} {
+    global id
      set m "[list expect [lindex $args end]]"
-     puts stderr $m
+     puts stderr "$id: $m"
 #     send_log "\n$m\n"
      eval expect $args
 }
@@ -47,7 +70,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"
@@ -66,32 +98,71 @@ 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"
+proc srcdump-prep {} {
+    global timeout env
+    set env(CAFTEST_NOSRCDUMP) 0
+    set timeout [expr {$timeout * 3}]
+}
 
-loginas bob
+proc srcdump-save-check {} {
+    global tt
+    global outertar sd files
+
+    set outertar $tt/t-srcdump.tgz
+    set sd $tt/t-srcdump.d
+
+    send "\x15$outertar\r"
+    etxt "Download complete"
+
+    exec mkdir $sd
+
+    set files [exec tar -C $sd -zvxf - < $outertar]
+
+    foreach f {
+	manifest.txt
+	licence.data       
+	cgi-auth-flexible.pm
+	.gitignore
+    } {
+	set got($f) 0
+    }
+
+    if {[file exists .git]} {
+	set got(.git/objects/) 0
+    }
+
+    foreach f $files {
+	switch -glob -- $f {
+	    licence.data - manifest.txt {
+		set got($f) 1
+	    }
+	    *.tar {
+		foreach g [exec tar -C $sd -tf - < $sd/$f] {
+		    switch -glob -- $g {
+			cgi-auth-flexible.pm - .gitignore - .git/objects/ {
+			    set got($g) 1
+			}
+			*~ {
+			    error "file $g inside $f !"
+			}
+			.git/* {
+			}
+			*.db {
+			    error "file $g inside $f outside .git !"
+			}
+		    }
+		}
+	    }
+	}
+    }
+
+    foreach g [array names got] {
+	if {!$got($g)} {
+	    error "file $g missing"
+	}
+    }
+}
 
-send "BBB\x10/Make sponges\r"
-submitform-expect "Login session interrupted"
+source $testfile
 
-puts ok
+puts "$id: ok"