add a very dumb pause method to stop test-execution

[apt.git] / test / integration / framework

diff --git a/test/integration/framework b/test/integration/framework
index 50c5157e961701edba56b02d81e198906c38ca30..96cdb5f5e31b9f01368646b5cdb0fdf5a17bcc7a 100644 (file)
--- a/test/integration/framework
+++ b/test/integration/framework
@@ -573,13 +573,22 @@ changetowebserver() {
        if which weborf > /dev/null; then
                weborf -xb aptarchive/ 2>&1 > /dev/null &
                addtrap "kill $!;"
-               local APTARCHIVE="file://$(readlink -f ./aptarchive)"
-               for LIST in $(find rootdir/etc/apt/sources.list.d/ -name 'apt-test-*.list'); do
-                       sed -i $LIST -e "s#$APTARCHIVE#http://localhost:8080/#"
-               done
-               return 0
+       elif which lighttpd > /dev/null; then
+               echo "server.document-root = \"$(readlink -f ./aptarchive)\"
+server.port = 8080
+server.stat-cache-engine = \"disable\"" > lighttpd.conf
+               lighttpd -t -f lighttpd.conf >/dev/null || msgdie 'Can not change to webserver: our lighttpd config is invalid'
+               lighttpd -D -f lighttpd.conf 2>/dev/null >/dev/null &
+               addtrap "kill $!;"
+       else
+               msgdie 'You have to install weborf or lighttpd first'
+               return 1
        fi
-       return 1
+       local APTARCHIVE="file://$(readlink -f ./aptarchive)"
+       for LIST in $(find rootdir/etc/apt/sources.list.d/ -name 'apt-test-*.list'); do
+               sed -i $LIST -e "s#$APTARCHIVE#http://localhost:8080/#"
+       done
+       return 0
 }
 
 checkdiff() {
@@ -695,7 +704,13 @@ testmarkedauto() {
                while [ -n "$1" ]; do echo "$1"; shift; done | sort > $COMPAREFILE
        else
                msgtest 'Test for correctly marked as auto-installed' 'no package'
-               echo > $COMPAREFILE
+               echo -n > $COMPAREFILE
        fi
        aptmark showauto 2>&1 | checkdiff $COMPAREFILE - && msgpass || msgfail
 }
+
+pause() {
+       echo "STOPPED execution. Press enter to continue"
+       local IGNORE
+       read IGNORE
+}