From 3498fbedafbf30e5c91deeaefa6a60d1e387593a Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Wed, 31 Aug 2022 21:49:33 +0200 Subject: Avoid dealing with a fake dpkg stanza in the tests We needed a fake dpkg in our status file for dpkg --assert-multi-arch to work in the past, but recent dpkg versions do not require this anymore, so we can remove this somewhat surprising hackery in favour of better hidden hackery we only use if we work with an older dpkg (e.g. on current Debian stable). --- test/integration/test-apt-mark | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) (limited to 'test/integration/test-apt-mark') diff --git a/test/integration/test-apt-mark b/test/integration/test-apt-mark index 630a0d460..d1c65ad7c 100755 --- a/test/integration/test-apt-mark +++ b/test/integration/test-apt-mark @@ -15,14 +15,10 @@ insertinstalledpackage 'bar' 'amd64' '1' setupaptarchive -# dpkg is "installed" by our test framework -testdpkginstalled dpkg - testnoautopkg() { testempty aptmark showauto testempty aptcache -q=1 showauto testsuccessequal 'bar -dpkg foo' aptmark showmanual testsuccessequal 'bar foo' aptmark showmanual bar foo uninstalled @@ -32,8 +28,7 @@ testfooisauto() { testsuccessequal 'foo' aptcache -q=1 showauto testsuccessequal 'foo' aptmark showauto foo testsuccessequal 'foo' aptcache -q=1 showauto foo - testsuccessequal 'bar -dpkg' aptmark showmanual + testsuccessequal 'bar' aptmark showmanual testsuccessequal 'bar' aptmark showmanual bar } testmarkonpkgasauto() { @@ -59,8 +54,6 @@ testmarkonpkgasauto 'aptget' 'markauto' 'unmarkauto' testnoholdpkg() { testempty aptmark showhold testempty aptmark showholds # typical "typo" - testempty aptmark showhold dpkg - testempty aptmark showholds dpkg } testpkgonhold() { testsuccessequal "$1" aptmark showhold -- cgit v1.2.3-70-g09d2