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-never-markauto-sections | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'test/integration/test-apt-never-markauto-sections') diff --git a/test/integration/test-apt-never-markauto-sections b/test/integration/test-apt-never-markauto-sections index 6ad89c506..a77d6b22b 100755 --- a/test/integration/test-apt-never-markauto-sections +++ b/test/integration/test-apt-never-markauto-sections @@ -25,11 +25,11 @@ setupaptarchive testsuccess aptcache show nosection testfailure grep 'Section' rootdir/tmp/testsuccess.output -testequal 'dpkg' aptmark showmanual +testempty aptmark showmanual testsuccess aptget install mydesktop -y -o Debug::pkgProblemResolver=1 -o Debug::pkgDepCache::Marker=1 -o Debug::pkgDepCache::AutoInstall=1 -testmarkedmanual 'dpkg' 'mydesktop' +testmarkedmanual 'mydesktop' testmarkedauto 'mydesktop-core' 'foreignpkg:i386' 'texteditor' 'browser' 'nosection' # if the remove is from a user, don't do manual-bit passing @@ -60,22 +60,22 @@ testsuccess aptget autoremove texteditor -y testdpkgnotinstalled mydesktop mydesktop-core texteditor testdpkginstalled browser -testmarkedmanual 'browser' 'dpkg' 'foreignpkg:i386' 'nosection' +testmarkedmanual 'browser' 'foreignpkg:i386' 'nosection' testmarkedauto # test that installed/upgraded auto-pkgs are not set to manual testsuccess aptget install browser=41 -y --allow-downgrades -testmarkedmanual 'browser' 'dpkg' 'foreignpkg:i386' 'nosection' +testmarkedmanual 'browser' 'foreignpkg:i386' 'nosection' testmarkedauto testsuccess aptmark auto browser testmarkedauto 'browser' testsuccess aptmark auto nosection testmarkedauto 'browser' 'nosection' -testmarkedmanual 'dpkg' 'foreignpkg:i386' +testmarkedmanual 'foreignpkg:i386' testsuccess aptget install mydesktop -y -o Debug::pkgProblemResolver=1 -o Debug::pkgDepCache::Marker=1 -o Debug::pkgDepCache::AutoInstall=1 -testmarkedmanual 'dpkg' 'foreignpkg:i386' 'mydesktop' +testmarkedmanual 'foreignpkg:i386' 'mydesktop' testmarkedauto 'browser' 'mydesktop-core' 'texteditor' 'nosection' -- cgit v1.2.3-70-g09d2