autopkgtests: Break out test-service-startup-prep

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

diff --git a/adt/acommon b/adt/acommon
index 83e2272a41df2e82e2eedd1dfabef281c4b15228..b0edb5d09558bc7b9b37e617c73d733d79a57c8f 100644 (file)
--- a/adt/acommon
+++ b/adt/acommon
@@ -35,6 +35,21 @@ test-prep () {
     fi
 }
 
+test-service-startup-prep () {
+    rsyslog-capture-daemon
+    service rsyslog force-reload
+
+    perl <test/test.cfg >/etc/hippotat/main.cfg -pe '
+           s{^addrs *=.*}{addrs = 127.0.0.1};
+    '
+
+    cat >>/etc/default/hippotatd <<END
+    set -x
+    CHECK_FIREWALL=false
+    USER=root
+END
+}
+
 filesystem-prep () {
     cs=$1; shift
     # expects $tmp to be set to test-specific temp dir (abs path)

diff --git a/adt/adt-initscript b/adt/adt-initscript
index 926305364fda2a99181161969c13c8efa34f50e5..0bf60a042e49fc407936c5b1e10014e9a5703066 100755 (executable)
--- a/adt/adt-initscript
+++ b/adt/adt-initscript
@@ -7,18 +7,7 @@ set -e
 
 test-prep
 
-rsyslog-capture-daemon
-service rsyslog force-reload
-
-perl <test/test.cfg >/etc/hippotat/main.cfg -pe '
-       s{^addrs *=.*}{addrs = 127.0.0.1};
-'
-
-cat >>/etc/default/hippotatd <<END
-set -x
-CHECK_FIREWALL=false
-USER=root
-END
+test-service-startup-prep
 
 # hippotatd is not actually running now because the init script checks
 # if we have any configured endpoints, and doesn't run it if not.