summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Vogt <michael.vogt@ubuntu.com>2012-11-05 11:39:47 +0100
committerMichael Vogt <michael.vogt@ubuntu.com>2012-11-05 11:39:47 +0100
commita7e926d57fbed2e0cc1c059364191a3544ce2fe5 (patch)
treec3ca257ec91d013686eea58d58b3226219465fe6
parent0b9f0e9bba678c3e5327a260faee96ea3a71df79 (diff)
also check that the running kernel is kept
-rwxr-xr-xtest/integration/test-kernel-helper-autoremove4
-rw-r--r--test/integration/test-kernel-helper-autoremove.fake-dpkg2
2 files changed, 4 insertions, 2 deletions
diff --git a/test/integration/test-kernel-helper-autoremove b/test/integration/test-kernel-helper-autoremove
index a4c31283e..4c0571b13 100755
--- 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 also that the running kernel is exlucded
+apt-config -c ${APT_CONFIG} dump|grep -q "APT::NeverAutoRemove::.*\^linux-image-$(uname -r)\.\*"
# 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 aec6d4418..a365c5370 100644
--- 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"
- 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"