test-indexes.sh: Refactor common code into functions

1 files changed, 81 insertions, 74 deletions

diff --git a/test/test-indexes.sh b/test/test-indexes.sh
index d79e9e7e4..fdc1a698a 100755
--- a/test/test-indexes.sh
+++ b/test/test-indexes.sh
@@ -15,7 +15,7 @@ TEST_PKG="python-psyco-doc"
 
 export LD_LIBRARY_PATH=$BUILDDIR/bin
 
-OPTS="-o RootDir=. -o Dir::Bin::Methods=$BUILDDIR/bin/methods -o Debug::NoLocking=true"
+OPTS="-qq -o RootDir=. -o Dir::Bin::Methods=$BUILDDIR/bin/methods -o Debug::NoLocking=true"
 DEBUG=""
 #DEBUG="-o Debug::pkgCacheGen=true"
 #DEBUG="-o Debug::pkgAcquire=true"
@@ -27,9 +27,25 @@ APT_CACHE="$BUILDDIR/bin/apt-cache $OPTS $DEBUG"
     exit 1
 }
 
+check_update() {
+    echo "--- apt-get update $@ (no trusted keys)"
+
+    rm -f etc/apt/trusted.gpg etc/apt/secring.gpg
+    touch etc/apt/trusted.gpg etc/apt/secring.gpg
+    out=$($APT_GET "$@" update 2>&1)
+    echo "$out" | grep -q NO_PUBKEY
+    key=$(echo "$out" | sed -n '/NO_PUBKEY/ { s/^.*NO_PUBKEY \([[:alnum:]]\+\)$/\1/; p}')
+    # get keyring
+    gpg -q --no-options --no-default-keyring --secret-keyring etc/apt/secring.gpg --trustdb-name etc/apt/trustdb.gpg --keyring etc/apt/trusted.gpg --primary-keyring etc/apt/trusted.gpg --keyserver $GPG_KEYSERVER --recv-keys $key
+
+    echo "--- apt-get update $@ (with trusted keys)"
+    $APT_GET "$@" update
+}
+
 # if $1 == "compressed", check that we have compressed indexes, otherwise
 # uncompressed ones
 check_indexes() {
+    echo "--- only ${1:-uncompressed} index files present"
     local F
     if [ "$1" = "compressed" ]; then
 	! test -e var/lib/apt/lists/*_Packages || F=1
@@ -44,12 +60,54 @@ check_indexes() {
     fi
 
     if [ -n "$F" ]; then
-	ls -l var/lib/apt/lists/
+	ls -laR var/lib/apt/lists/
 	exit 1
     fi
 }
 
-echo "---- building sandbox----"
+# test apt-cache commands
+check_cache() {
+    echo "--- apt-cache commands"
+
+    $APT_CACHE show $TEST_PKG | grep -q ^Version:
+    # again (with cache)
+    $APT_CACHE show $TEST_PKG | grep -q ^Version:
+    rm var/cache/apt/*.bin
+    $APT_CACHE policy $TEST_PKG | grep -q '500 http://'
+    # again (with cache)
+    $APT_CACHE policy $TEST_PKG | grep -q '500 http://'
+
+    TEST_SRC=`$APT_CACHE show $TEST_PKG | grep ^Source: | awk '{print $2}'`
+    rm var/cache/apt/*.bin
+    $APT_CACHE showsrc $TEST_SRC | grep -q ^Binary:
+    # again (with cache)
+    $APT_CACHE showsrc $TEST_SRC | grep -q ^Binary:
+}
+
+# test apt-get install
+check_install() {
+    echo "--- apt-get install"
+
+    $APT_GET install -d $TEST_PKG 
+    test -e var/cache/apt/archives/$TEST_PKG*.deb
+    $APT_GET clean
+    ! test -e var/cache/apt/archives/$TEST_PKG*.deb
+}
+
+# test apt-get source
+check_get_source() {
+    echo "--- apt-get source"
+    $APT_GET source $TEST_PKG
+    test -f $TEST_SRC_*.dsc
+    test -d $TEST_SRC-*
+    rm -r $TEST_SRC*
+}
+
+############################################################################
+# main
+############################################################################
+
+echo "===== building sandbox ====="
 WORKDIR=$(mktemp -d)
 trap "cd /; rm -rf $WORKDIR" 0 HUP INT QUIT ILL ABRT FPE SEGV PIPE TERM
 cd $WORKDIR
@@ -63,87 +121,36 @@ touch var/lib/dpkg/status
 echo "deb $TEST_SOURCE" > etc/apt/sources.list
 echo "deb-src $TEST_SOURCE" >> etc/apt/sources.list
 
-echo "---- uncompressed update ----"
+echo "===== uncompressed indexes ====="
 # first attempt should fail, no trusted GPG key
-out=$($APT_GET update 2>&1)
-echo "$out" | grep -q NO_PUBKEY
-key=$(echo "$out" | sed -n '/NO_PUBKEY/ { s/^.*NO_PUBKEY \([[:alnum:]]\+\)$/\1/; p}')
-# get keyring
-gpg --no-options --no-default-keyring --secret-keyring etc/apt/secring.gpg --trustdb-name etc/apt/trustdb.gpg --keyring etc/apt/trusted.gpg --primary-keyring etc/apt/trusted.gpg --keyserver $GPG_KEYSERVER --recv-keys $key
-$APT_GET update
+check_update
 check_indexes
+check_cache
+check_install
+check_get_source
 
-echo "---- uncompressed cache ----"
-$APT_CACHE show $TEST_PKG | grep -q ^Version:
-# again (with cache)
-$APT_CACHE show $TEST_PKG | grep -q ^Version:
-rm var/cache/apt/*.bin
-$APT_CACHE policy $TEST_PKG | grep -q '500 http://'
-# again (with cache)
-$APT_CACHE policy $TEST_PKG | grep -q '500 http://'
-
-TEST_SRC=`$APT_CACHE show $TEST_PKG | grep ^Source: | awk '{print $2}'`
-rm var/cache/apt/*.bin
-$APT_CACHE showsrc $TEST_SRC | grep -q ^Binary:
-# again (with cache)
-$APT_CACHE showsrc $TEST_SRC | grep -q ^Binary:
-
-echo "---- uncompressed install ----"
-$APT_GET install -d $TEST_PKG 
-test -e var/cache/apt/archives/$TEST_PKG*.deb
-$APT_GET clean
-! test -e var/cache/apt/archives/$TEST_PKG*.deb
-
-echo "---- uncompressed get source ----"
-$APT_GET source $TEST_PKG
-test -f $TEST_SRC_*.dsc
-test -d $TEST_SRC-*
-rm -r $TEST_SRC*
-
-echo "----- uncompressed update with preexisting indexes, no pdiff ----"
-$APT_GET -o Acquire::PDiffs=false update
+echo "--- apt-get update with preexisting indexes"
+$APT_GET update
 check_indexes
 
-echo "----- uncompressed update with preexisting indexes, with pdiff ----"
+echo "--- apt-get update with preexisting indexes and pdiff mode"
 $APT_GET -o Acquire::PDiffs=true update
 check_indexes
 
-echo "----- compressed update ----"
+echo "===== compressed indexes ====="
 find var/lib/apt/lists/ -type f | xargs -r rm
-$APT_GET -o Acquire::GzipIndexes=true update
+check_update -o Acquire::GzipIndexes=true
 check_indexes compressed
+check_cache
+check_install
+check_get_source
 
-echo "---- compressed cache ----"
-$APT_CACHE show $TEST_PKG | grep -q ^Version:
-# again (with cache)
-$APT_CACHE show $TEST_PKG | grep -q ^Version:
-rm var/cache/apt/*.bin
-$APT_CACHE policy $TEST_PKG | grep -q '500 http://'
-# again (with cache)
-$APT_CACHE policy $TEST_PKG | grep -q '500 http://'
-
-TEST_SRC=`$APT_CACHE show $TEST_PKG | grep ^Source: | awk '{print $2}'`
-rm var/cache/apt/*.bin
-$APT_CACHE showsrc $TEST_SRC | grep -q ^Binary:
-# again (with cache)
-$APT_CACHE showsrc $TEST_SRC | grep -q ^Binary:
-
-echo "---- compressed install ----"
-$APT_GET install -d $TEST_PKG 
-! test -e var/cache/apt/archives/$TEST_PKG*.deb
-
-echo "---- compressed get source ----"
-$APT_GET source $TEST_PKG
-test -f $TEST_SRC_*.dsc
-test -d $TEST_SRC-*
-rm -r $TEST_SRC*
-
-echo "----- compressed update with preexisting indexes, no pdiff ----"
-$APT_GET -o Acquire::PDiffs=false -o Acquire::GzipIndexes=true update
-check_indexes compressed
+echo "--- apt-get update with preexisting indexes"
+check_update -o Acquire::GzipIndexes=true
+check_indexes
 
-echo "----- compressed update with preexisting indexes, with pdiff ----"
-$APT_GET -o Acquire::PDiffs=true -o Acquire::GzipIndexes=true update
-check_indexes compressed
+echo "--- apt-get update with preexisting indexes and pdiff mode"
+check_update -o Acquire::GzipIndexes=true -o Acquire::PDiffs=true update
+check_indexes
 
-echo "---- ALL TESTS PASSED ----"
+echo "===== ALL TESTS PASSED ====="