also check that the running kernel is kept

diff --git a/test/integration/test-kernel-helper-autoremove b/test/integration/test-kernel-helper-autoremove
index a4c31283ef67326193f40be2608059166bd191f2..4c0571b13c9a013e563402ff7c04e1fb9fe3076c 100755 (executable)
--- a/test/integration/test-kernel-helper-autoremove
+++ b/test/integration/test-kernel-helper-autoremove
@@ -28,6 +28,8 @@ sh  ${TESTDIR}/../../debian/apt.auto-removal.sh
 # and ensure its there, valid and version 10.0.0-1 is there too
 test -e $TMPDIR/apt.conf.d/01autoremove-kernels
 apt-config -c ${APT_CONFIG} dump|grep -q "APT::NeverAutoRemove::.*\^linux-image-10.0.0-1-generic\.\*" 
 # and ensure its there, valid and version 10.0.0-1 is there too
 test -e $TMPDIR/apt.conf.d/01autoremove-kernels
 apt-config -c ${APT_CONFIG} dump|grep -q "APT::NeverAutoRemove::.*\^linux-image-10.0.0-1-generic\.\*" 

+# ... and also that the running kernel is exlucded
+apt-config -c ${APT_CONFIG} dump|grep -q "APT::NeverAutoRemove::.*\^linux-image-$(uname -r)\.\*" 

 
 # done
 
 # done

-msgpass
\ No newline at end of file
+msgpass

diff --git a/test/integration/test-kernel-helper-autoremove.fake-dpkg b/test/integration/test-kernel-helper-autoremove.fake-dpkg
index aec6d4418696183fc6f1561e0b9033ac87d2a1e5..a365c537010716291750e68d1795d4dbce41abf0 100644 (file)
--- a/test/integration/test-kernel-helper-autoremove.fake-dpkg
+++ b/test/integration/test-kernel-helper-autoremove.fake-dpkg
@@ -3,7 +3,7 @@ set -e
 
 if [ "$1" = "-l" ]; then
     echo "ii  linux-image-1.0.0-2-generic  1.0.01-2  amd64"
 
 if [ "$1" = "-l" ]; then
     echo "ii  linux-image-1.0.0-2-generic  1.0.01-2  amd64"

-    echo "ii  linux-image-3.5.0-17-generic  3.5.0-17  amd64"
+    echo "ii  linux-image-$(uname -r)  not-used  amd64"

     echo "ii linux-image-10.0.0-1-generic  10.0.0.1-1  amd64"
 elif [ "$1" = "--compare-versions" ]; then
     dpkg "$1" "$2" "$3" "$4"
     echo "ii linux-image-10.0.0-1-generic  10.0.0.1-1  amd64"
 elif [ "$1" = "--compare-versions" ]; then
     dpkg "$1" "$2" "$3" "$4"