Merge commit 'e2073b0276226b625897ef475f225bf8f508719e' as 'triehash'

[apt.git] / test / integration / test-essential-force-loopbreak

diff --git a/test/integration/test-essential-force-loopbreak b/test/integration/test-essential-force-loopbreak
index 1493430d85c24175413695e31edebdad83ccabd4..f585e9c424b02061e3356bc03092315c265a9466 100755 (executable)
--- a/test/integration/test-essential-force-loopbreak
+++ b/test/integration/test-essential-force-loopbreak
@@ -1,8 +1,8 @@
 #!/bin/sh
 set -e
 
 #!/bin/sh
 set -e
 

-TESTDIR=$(readlink -f $(dirname $0))
-. $TESTDIR/framework
+TESTDIR="$(readlink -f "$(dirname "$0")")"
+. "$TESTDIR/framework"

 
 setupenvironment
 configarchitecture 'native'
 
 setupenvironment
 configarchitecture 'native'


@@ -25,9 +25,9 @@ cp -a rootdir/var/lib/dpkg/status dpkg.status.backup
 testforcebreak() {
        cp -a dpkg.status.backup rootdir/var/lib/dpkg/status
        rm -f rootdir/var/lib/apt/extended_states
 testforcebreak() {
        cp -a dpkg.status.backup rootdir/var/lib/dpkg/status
        rm -f rootdir/var/lib/apt/extended_states

-       testequal "Reading package lists...
+       testfailureequal "Reading package lists...

 Building dependency tree...
 Building dependency tree...

-The following extra packages will be installed:
+The following additional packages will be installed:

   sysvinit
 The following NEW packages will be installed:
   systemd-sysv
   sysvinit
 The following NEW packages will be installed:
   systemd-sysv


@@ -43,6 +43,9 @@ E: Internal Error, Could not early remove sysvinit:$(dpkg --print-architecture)
 
        # with enough force however …
        cp -a dpkg.status.backup rootdir/var/lib/dpkg/status
 
        # with enough force however …
        cp -a dpkg.status.backup rootdir/var/lib/dpkg/status

+       testsuccess aptget install systemd-sysv -y -t "$1" -o APT::Force-LoopBreak=1 -o Debug::pkgDpkgPm=1
+       cp rootdir/tmp/testsuccess.output apt.output
+       testsuccess grep -- '--force-remove-essential --remove sysvinit' apt.output

        testsuccess aptget install systemd-sysv -y -t "$1" -o APT::Force-LoopBreak=1
        testdpkginstalled 'sysvinit' 'systemd-sysv'
 }
        testsuccess aptget install systemd-sysv -y -t "$1" -o APT::Force-LoopBreak=1
        testdpkginstalled 'sysvinit' 'systemd-sysv'
 }