X-Git-Url: https://git.saurik.com/apt.git/blobdiff_plain/90b56f542e0ae722c843265f4e6250cc0a096f5d..baec76f5f0f9fcbd71f6e2afaa7fc85543bd624c:/test/integration/test-apt-progress-fd-error diff --git a/test/integration/test-apt-progress-fd-error b/test/integration/test-apt-progress-fd-error index ccbb000c7..4439c042a 100755 --- a/test/integration/test-apt-progress-fd-error +++ b/test/integration/test-apt-progress-fd-error @@ -1,8 +1,8 @@ #!/bin/sh set -e -TESTDIR=$(readlink -f $(dirname $0)) -. $TESTDIR/framework +TESTDIR="$(readlink -f "$(dirname "$0")")" +. "$TESTDIR/framework" setupenvironment configarchitecture 'native' @@ -12,10 +12,14 @@ touch usr/bin/file-conflict buildsimplenativepackage 'foo1' 'native' '0.8.15' 'stable' '' 'pkg with file conflicts' '' '' 'usr/' buildsimplenativepackage 'foo2' 'native' '0.8.15' 'stable' '' 'pkg with file conflicts' '' '' 'usr/' +insertinstalledpackage 'apport' 'native' '1' setupaptarchive exec 3> apt-progress.log testfailure aptget install foo1 foo2 -y -o APT::Status-Fd=3 msgtest 'Ensure correct error message' -testsuccess --nomsg grep "aptarchive/pool/foo2_0.8.15_[^.]\+.deb:36.3636:trying to overwrite '/usr/bin/file-conflict', which is also in package foo1 0.8.15" apt-progress.log +testsuccess --nomsg grep "foo2_0.8.15_[^.]\+.deb:36.3636:trying to overwrite '/usr/bin/file-conflict', which is also in package foo1 0.8.15" apt-progress.log + +testsuccess test -s rootdir/var/crash/foo2.0.crash +testsuccess grep '^Package: foo2 0.8.15$' rootdir/var/crash/foo2.0.crash