X-Git-Url: https://git.saurik.com/apt.git/blobdiff_plain/3b3a681c79d3e5c32fcd6ccb87e74e5ca6e234b4..0343b48e06fb990ee15a020bc6716b1a5a984e14:/test/integration/test-ubuntu-bug-614993?ds=sidebyside diff --git a/test/integration/test-ubuntu-bug-614993 b/test/integration/test-ubuntu-bug-614993 index f54909bc2..e7357bc67 100755 --- a/test/integration/test-ubuntu-bug-614993 +++ b/test/integration/test-ubuntu-bug-614993 @@ -1,8 +1,8 @@ #!/bin/sh set -e -local TESTDIR=$(readlink -f $(dirname $0)) -. $TESTDIR/framework +TESTDIR="$(readlink -f "$(dirname "$0")")" +. "$TESTDIR/framework" setupenvironment configarchitecture "amd64" setupaptarchive @@ -10,7 +10,7 @@ setupaptarchive # test success UPGRADE="Reading package lists... Building dependency tree... -The following extra packages will be installed: +The following additional packages will be installed: libdrm-intel1 libdrm-nouveau1 libmtdev1 libutouch-grail1 libx11-xcb1 libxcb-aux0 libxcb-dri2-0 libxfont1 xserver-common xserver-xorg-core xserver-xorg-input-evdev xserver-xorg-input-mouse @@ -52,8 +52,8 @@ The following packages will be upgraded: xserver-xorg-video-tseng xserver-xorg-video-vesa xserver-xorg-video-vmware xserver-xorg-video-voodoo 41 upgraded, 5 newly installed, 1 to remove and 3 not upgraded. -Need to get 0B/5505kB of archives. -After this operation, 2294kB disk space will be freed. +Need to get 0 B/5505 kB of archives. +After this operation, 2294 kB disk space will be freed. E: Trivial Only specified but this is not a trivial operation." -testequal "$UPGRADE" aptget install xserver-xorg --trivial-only +testfailureequal "$UPGRADE" aptget install xserver-xorg --trivial-only