The entire concept of PendingError() is flawed :/.

[apt.git] / test / integration / test-bug-770291-reinstall

diff --git a/test/integration/test-bug-770291-reinstall b/test/integration/test-bug-770291-reinstall
index a5b2aff0791ae8f0852fdf5aba430a340cd582f9..389fb181497c87a6a4bd4202a822314c520aeba4 100755 (executable)
--- a/test/integration/test-bug-770291-reinstall
+++ b/test/integration/test-bug-770291-reinstall
@@ -1,8 +1,8 @@
 #!/bin/sh
 set -e
 
-TESTDIR=$(readlink -f $(dirname $0))
-. $TESTDIR/framework
+TESTDIR="$(readlink -f "$(dirname "$0")")"
+. "$TESTDIR/framework"
 setupenvironment
 configarchitecture 'i386'
 
@@ -20,21 +20,21 @@ Pre-Depends: systemd'
 insertpackage 'unstable,installed' 'systemd' 'i386' '215-5+b1' 'Pre-Depends: libc6, libselinux1'
 
 # depends loop
-insertpackage 'unstable,installed' 'dependsA' 'i386' '1' 'Depends: dependsB
+insertpackage 'unstable,installed' 'dependsa' 'i386' '1' 'Depends: dependsb
 Essential: yes'
-insertpackage 'unstable,installed' 'dependsB' 'i386' '1' 'Depends: dependsA
+insertpackage 'unstable,installed' 'dependsb' 'i386' '1' 'Depends: dependsa
 Essential: yes'
 
 # pre-depends loop
-insertpackage 'unstable,installed' 'predependsA' 'i386' '1' 'Pre-Depends: predependsB
+insertpackage 'unstable,installed' 'predependsa' 'i386' '1' 'Pre-Depends: predependsb
 Essential: yes'
-insertpackage 'unstable,installed' 'predependsB' 'i386' '1' 'Pre-Depends: predependsA
+insertpackage 'unstable,installed' 'predependsb' 'i386' '1' 'Pre-Depends: predependsa
 Essential: yes'
 
 # pre-depends-to-depends loop
-insertpackage 'unstable,installed' 'predependsdependsA' 'i386' '1' 'Pre-Depends: predependsdependsB
+insertpackage 'unstable,installed' 'predependsdependsa' 'i386' '1' 'Pre-Depends: predependsdependsb
 Essential: yes'
-insertpackage 'unstable,installed' 'predependsdependsB' 'i386' '1' 'Depends: predependsdependsA
+insertpackage 'unstable,installed' 'predependsdependsb' 'i386' '1' 'Depends: predependsdependsa
 Essential: yes'
 
 setupaptarchive
@@ -50,19 +50,19 @@ Conf systemd-sysv (215-5+b1 unstable [i386])' aptget install --reinstall systemd
 testsuccessequal 'Reading package lists...
 Building dependency tree...
 0 upgraded, 0 newly installed, 2 reinstalled, 0 to remove and 0 not upgraded.
-Inst dependsA [1] (1 unstable [i386])
-Inst dependsB [1] (1 unstable [i386])
-Conf dependsB (1 unstable [i386])
-Conf dependsA (1 unstable [i386])' aptget install --reinstall dependsA dependsB -s
+Inst dependsa [1] (1 unstable [i386])
+Inst dependsb [1] (1 unstable [i386])
+Conf dependsb (1 unstable [i386])
+Conf dependsa (1 unstable [i386])' aptget install --reinstall dependsa dependsb -s
 
 # there is a chance dpkg can actually do these, BUT this depends on the maintainerscripts (not) present
 # which is very very risky to depend on (and apt doesn't know about that anyhow).
-testfailure aptget install --reinstall predependsA predependsB -s -o Debug::pkgPackageManager=1
-testequal "E: Couldn't configure predependsA:i386, probably a dependency cycle." tail -n1 rootdir/tmp/testfailure.output
+testfailure aptget install --reinstall predependsa predependsb -s -o Debug::pkgPackageManager=1
+testsuccess grep "^E: Couldn't configure predependsa:i386, probably a dependency cycle.$" rootdir/tmp/testfailure.output
 
 # FIXME: the error message is a catch all here, not like the one above
-testfailure aptget install --reinstall predependsdependsA predependsdependsB -s -o Debug::pkgPackageManager=1
-testequal "E: Could not configure 'predependsdependsB:i386'. " tail -n1 rootdir/tmp/testfailure.output
+testfailure aptget install --reinstall predependsdependsa predependsdependsb -s -o Debug::pkgPackageManager=1
+testsuccess grep "^E: Could not configure 'predependsdependsb:i386'. $" rootdir/tmp/testfailure.output
 
 
 msgmsg 'While we are at it, lets try these loops without reinstall as well'
@@ -81,18 +81,18 @@ Conf systemd-sysv (215-5+b1 unstable [i386])' aptget install systemd systemd-sys
 testsuccessequal 'Reading package lists...
 Building dependency tree...
 The following NEW packages will be installed:
-  dependsA dependsB
+  dependsa dependsb
 0 upgraded, 2 newly installed, 0 to remove and 0 not upgraded.
-Inst dependsA (1 unstable [i386]) []
-Inst dependsB (1 unstable [i386])
-Conf dependsB (1 unstable [i386])
-Conf dependsA (1 unstable [i386])' aptget install dependsA dependsB -s
+Inst dependsa (1 unstable [i386]) []
+Inst dependsb (1 unstable [i386])
+Conf dependsb (1 unstable [i386])
+Conf dependsa (1 unstable [i386])' aptget install dependsa dependsb -s
 
 # there is a chance dpkg can actually do these, BUT this depends on the maintainerscripts (not) present
 # which is very very risky to depend on (and apt doesn't know about that anyhow).
-testfailure aptget install predependsA predependsB -s -o Debug::pkgPackageManager=1
-testequal "E: Couldn't configure predependsA:i386, probably a dependency cycle." tail -n1 rootdir/tmp/testfailure.output
+testfailure aptget install predependsa predependsb -s -o Debug::pkgPackageManager=1
+testsuccess grep "^E: Couldn't configure predependsa:i386, probably a dependency cycle.$" rootdir/tmp/testfailure.output
 
 # FIXME: the error message is a catch all here, not like the one above
-testfailure aptget install predependsdependsA predependsdependsB -s -o Debug::pkgPackageManager=1
-testequal "E: Could not configure 'predependsdependsB:i386'. " tail -n1 rootdir/tmp/testfailure.output
+testfailure aptget install predependsdependsa predependsdependsb -s -o Debug::pkgPackageManager=1
+testsuccess grep "^E: Could not configure 'predependsdependsb:i386'. $" rootdir/tmp/testfailure.output