Testing: Break out srcdump-prep

Remove a bit more of this boilerplate.

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

diff --git a/tests/autotest b/tests/autotest
index 4737b1ef7c39c98853d956bf8621350645ead529..4fc506835f9dc6365ccbb70b5944187160f3aabe 100755 (executable)
--- a/tests/autotest
+++ b/tests/autotest
@@ -98,6 +98,12 @@ proc loginas {user {password sesame} {wanttxt ACCESSGRANTED}} {
      submitform-expect $wanttxt
 }
 
+proc srcdump-prep {} {
+    global timeout env
+    set env(CAFTEST_NOSRCDUMP) 0
+    set timeout [expr {$timeout * 3}]
+}
+
 proc srcdump-save-check {} {
     global tt
     global outertar sd files

diff --git a/tests/srcdump-login.at b/tests/srcdump-login.at
index 895fa363ff1442443275ba9d803ff602da12eff0..6d7d0c9cdb35e887923557df9759a96b75998b26 100644 (file)
--- a/tests/srcdump-login.at
+++ b/tests/srcdump-login.at
@@ -17,9 +17,7 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU Affero General Public License for more details.
 
-set env(CAFTEST_NOSRCDUMP) 0
-
-set timeout [expr {$timeout * 3}]
+srcdump-prep
 
 dospawn
 

diff --git a/tests/srcdump-loginback.at b/tests/srcdump-loginback.at
index 4a2e402a93b48231cfda1fcfacefe26420a3564e..856a6f2861fc406c16a8b53b491a9f223feab780 100644 (file)
--- a/tests/srcdump-loginback.at
+++ b/tests/srcdump-loginback.at
@@ -17,9 +17,7 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU Affero General Public License for more details.
 
-set env(CAFTEST_NOSRCDUMP) 0
-
-set timeout [expr {$timeout * 3}]
+srcdump-prep
 
 dospawn