ensure filesize of deb is included in the hashes list

[apt.git] / test / integration / test-apt-get-autoremove

diff --git a/test/integration/test-apt-get-autoremove b/test/integration/test-apt-get-autoremove
index 455079cf13bc4879d05cd9739c20d3d5eb460ced..7a28c51f18bd15bc897e9a4adf5be7f2c99bc985 100755 (executable)
--- a/test/integration/test-apt-get-autoremove
+++ b/test/integration/test-apt-get-autoremove
@@ -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'
 
@@ -19,6 +19,10 @@ testsuccess aptget remove debhelper -y
 testdpkgnotinstalled 'debhelper'
 testdpkginstalled 'po-debconf' 'unrelated'
 
+AUTOREMOVE='apt autoremove'
+if [ -n "$SUDO_USER" ]; then
+       AUTOREMOVE="sudo $AUTOREMOVE"
+fi
 echo 'APT::NeverAutoRemove { "^debc.*nf$"; };' > rootdir/etc/apt/apt.conf.d/00autoremove
 testsuccessequal 'Reading package lists...
 Building dependency tree...
@@ -32,13 +36,13 @@ Building dependency tree...
 Reading state information...
 The following package was automatically installed and is no longer required:
   po-debconf
-Use 'apt-get autoremove' to remove it.
+Use '$AUTOREMOVE' to remove it.
 0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded." aptget install -s
 testequal "Reading package lists...
 Building dependency tree...
 Reading state information...
 1 package was automatically installed and is no longer required.
-Use 'apt-get autoremove' to remove it.
+Use '$AUTOREMOVE' to remove it.
 0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded." aptget install -s -o APT::Get::HideAutoRemove=small
 testdpkginstalled 'po-debconf'
 
@@ -55,7 +59,10 @@ testsuccess aptget autoremove -y
 testdpkgnotinstalled 'po-debconf'
 testmarkedauto
 
-sed rootdir/var/log/apt/history.log -e '/^Commandline: / d' -e '/^Start-Date: / d' -e '/^End-Date: / d' -e 's#), #)\nInstall: #g' | sort -u > apt-history.log
+sed rootdir/var/log/apt/history.log -e '/^Commandline: / d' \
+       -e '/^Start-Date: / d' -e '/^End-Date: / d' \
+       -e '/^Requested-By: / d' \
+       -e 's#), #)\nInstall: #g' | sort -u > apt-history.log
 testfileequal 'apt-history.log' '
 Install: debhelper:i386 (8.0.0)
 Install: po-debconf:i386 (1.0.16, automatic)
@@ -81,13 +88,13 @@ Building dependency tree...
 Reading state information...
 The following packages were automatically installed and are no longer required:
   debhelper po-debconf
-Use 'apt-get autoremove' to remove them.
+Use '$AUTOREMOVE' to remove them.
 0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded." aptget install -s
 testequal "Reading package lists...
 Building dependency tree...
 Reading state information...
 2 packages were automatically installed and are no longer required.
-Use 'apt-get autoremove' to remove them.
+Use '$AUTOREMOVE' to remove them.
 0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded." aptget install -s -o APT::Get::HideAutoRemove=small
 
 testsuccess aptmark hold debhelper