summaryrefslogtreecommitdiff
path: root/test/integration/test-apt-mark
diff options
context:
space:
mode:
authorDavid Kalnischkies <david@kalnischkies.de>2022-08-31 21:49:33 +0200
committerDavid Kalnischkies <david@kalnischkies.de>2022-09-02 16:55:45 +0200
commit3498fbedafbf30e5c91deeaefa6a60d1e387593a (patch)
tree45428464f191427a27b3d97a4ec601571aee70bd /test/integration/test-apt-mark
parent49f9cfba5567cd034bf729a63b3f6e9badd9bc35 (diff)
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).
Diffstat (limited to 'test/integration/test-apt-mark')
-rwxr-xr-xtest/integration/test-apt-mark9
1 files changed, 1 insertions, 8 deletions
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