Testing: Break out srcdump-save-check

Originally I thought I would keep only one of the srcdump tests, but I
have changed my mind.  So we need to get rid of this clone-and-hack.

srcdump-save-check was identical in the two scripts.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

diff --git a/tests/autotest b/tests/autotest
index b07913fa68bc0cc08e5f0c5a01ef8207cce930d5..4737b1ef7c39c98853d956bf8621350645ead529 100755 (executable)
--- a/tests/autotest
+++ b/tests/autotest
@@ -98,6 +98,65 @@ proc loginas {user {password sesame} {wanttxt ACCESSGRANTED}} {
      submitform-expect $wanttxt
 }
 
      submitform-expect $wanttxt
 }
 

+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"
+       }
+    }
+}
+

 source $testfile
 
 puts "$id: ok"
 source $testfile
 
 puts "$id: ok"

diff --git a/tests/srcdump-login.at b/tests/srcdump-login.at
index 8fbfb8c9fbafb3e9109b584d97816dd5b3e2b80c..895fa363ff1442443275ba9d803ff602da12eff0 100644 (file)
--- a/tests/srcdump-login.at
+++ b/tests/srcdump-login.at
@@ -29,56 +29,4 @@ submitform-expect "Viewing"
 
 loginas alice sesame "Save file to"
 
 
 loginas alice sesame "Save file to"
 

-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"
-    }
-}
+srcdump-save-check

diff --git a/tests/srcdump-loginback.at b/tests/srcdump-loginback.at
index 76554ab507d1b974911d0d1b32dd53354147fb88..4a2e402a93b48231cfda1fcfacefe26420a3564e 100644 (file)
--- a/tests/srcdump-loginback.at
+++ b/tests/srcdump-loginback.at
@@ -29,56 +29,4 @@ send "B/source available\r\r"
 
 etxt "Save file to"
 
 
 etxt "Save file to"
 

-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"
-    }
-}
+srcdump-save-check