implement generic config fallback for methods

[apt.git] / test / integration / test-bug-611729-mark-as-manual

diff --git a/test/integration/test-bug-611729-mark-as-manual b/test/integration/test-bug-611729-mark-as-manual
index 9cf01610cf645e2f7929865d7177505f63128ede..97ef846e3e1f530555e0470d50dbfc1d71f5b8b4 100755 (executable)
--- a/test/integration/test-bug-611729-mark-as-manual
+++ b/test/integration/test-bug-611729-mark-as-manual
@@ -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 "i386"
 
 setupenvironment
 configarchitecture "i386"
 


@@ -15,76 +15,82 @@ buildsimplenativepackage "c" "all" "1.0" "stable" "Depends: b"
 setupaptarchive
 
 # dpkg freaks out if the last package is removed so keep one around
 setupaptarchive
 
 # dpkg freaks out if the last package is removed so keep one around

-aptget install peace-dpkg -y -qq 2>&1 > /dev/null
+testsuccess aptget install peace-dpkg -y

 testdpkginstalled peace-dpkg
 testmarkedauto
 
 testdpkginstalled peace-dpkg
 testmarkedauto
 

-aptget install a -y -qq 2>&1 > /dev/null
+testsuccess aptget install a -y

 testdpkginstalled a b
 testdpkgnotinstalled c
 testmarkedauto 'b'
 
 testdpkginstalled a b
 testdpkgnotinstalled c
 testmarkedauto 'b'
 

-aptget remove a -y -qq 2>&1 > /dev/null
+testsuccess aptget remove a -y

 testdpkgnotinstalled a c
 testdpkginstalled b
 testmarkedauto 'b'
 
 testdpkgnotinstalled a c
 testdpkginstalled b
 testmarkedauto 'b'
 

-aptget install c -y -qq 2>&1 > /dev/null
+testsuccess aptget install c -y

 testdpkgnotinstalled a
 testdpkginstalled b c
 testmarkedauto 'b'
 
 testdpkgnotinstalled a
 testdpkginstalled b c
 testmarkedauto 'b'
 

-testequal 'Reading package lists...
+testsuccessequal 'Reading package lists...

 Building dependency tree...
 Reading state information...
 Building dependency tree...
 Reading state information...

-b is already the newest version.
+b is already the newest version (1.0).

 0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded.' aptget install b --only-upgrade
 testmarkedauto 'b'
 
 0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded.' aptget install b --only-upgrade
 testmarkedauto 'b'
 

-testequal 'Reading package lists...
+testsuccessequal 'Reading package lists...

 Building dependency tree...
 Reading state information...
 Building dependency tree...
 Reading state information...

-b is already the newest version.
+b is already the newest version (1.0).

 0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded.' aptget install b -d
 testmarkedauto 'b'
 
 rm rootdir/var/log/apt/history.log
 
 0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded.' aptget install b -d
 testmarkedauto 'b'
 
 rm rootdir/var/log/apt/history.log
 

-aptget install b --reinstall -y -qq 2>&1 > /dev/null
+testsuccess aptget install b --reinstall -y

 testdpkgnotinstalled a
 testdpkginstalled b c
 testmarkedauto 'b'
 
 sed -i rootdir/var/log/apt/history.log -e '/^Commandline: / d' -e '/^Start-Date: / d' -e '/^End-Date: / d'
 testdpkgnotinstalled a
 testdpkginstalled b c
 testmarkedauto 'b'
 
 sed -i rootdir/var/log/apt/history.log -e '/^Commandline: / d' -e '/^Start-Date: / d' -e '/^End-Date: / d'

-testfileequal 'rootdir/var/log/apt/history.log' '
+if [ -n "$SUDO_USER" ]; then
+       testfileequal 'rootdir/var/log/apt/history.log' "
+Requested-By: $SUDO_USER ($(id -u "$SUDO_USER"))
+Reinstall: b:i386 (1.0)"
+else
+       testfileequal 'rootdir/var/log/apt/history.log' '

 Reinstall: b:i386 (1.0)'
 Reinstall: b:i386 (1.0)'

+fi

 
 

-testequal 'Reading package lists...
+testsuccessequal 'Reading package lists...

 Building dependency tree...
 Reading state information...
 Building dependency tree...
 Reading state information...

-b is already the newest version.
+b is already the newest version (1.0).

 b set to manually installed.
 0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded.' aptget install b
 testmarkedauto
 
 b set to manually installed.
 0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded.' aptget install b
 testmarkedauto
 

-aptget remove b -y -qq 2>&1 > /dev/null
+testsuccess aptget remove b -y

 testdpkgnotinstalled a b c
 testmarkedauto
 
 testdpkgnotinstalled a b c
 testmarkedauto
 

-aptget install a b -y -qq 2>&1 > /dev/null
+testsuccess aptget install a b -y

 testdpkginstalled a b
 testdpkgnotinstalled c
 testmarkedauto
 
 testdpkginstalled a b
 testdpkgnotinstalled c
 testmarkedauto
 

-aptget purge a b -y -qq 2>&1 > /dev/null
+testsuccess aptget purge a b -y

 testdpkgnotinstalled a b c
 testmarkedauto
 
 testdpkgnotinstalled a b c
 testmarkedauto
 

-aptget install b c -y -qq 2>&1 > /dev/null
+testsuccess aptget install b c -y

 testdpkgnotinstalled a
 testdpkginstalled b c
 testmarkedauto
 
 testdpkgnotinstalled a
 testdpkginstalled b c
 testmarkedauto
 

-aptget install a -y -qq 2>&1 > /dev/null
+testsuccess aptget install a -y

 testdpkginstalled a b c
 testmarkedauto
 testdpkginstalled a b c
 testmarkedauto