test: Always install dpkg into our tests, regardless of MA

Even if we only configure a single architecture, install dpkg, so
dpkg can assert multi arch correctly. This also has the nice side
effect of making single architecture and multiple architecture
test cases more uniform.

This fixes a regression from f878d3a862128bc1385616751ae1d78246b1bd01
("test: Assert multi-arch in the chroot").

diff --git a/test/integration/framework b/test/integration/framework
index c5b752e1809fd7f917b1f8e8ab484291126e8a3f..d5b68da84bad47c20c2140f2b911ec4db52c0af8 100644 (file)
--- a/test/integration/framework
+++ b/test/integration/framework
@@ -534,13 +534,11 @@ configdpkg() {
                fi
        fi
        rm -f rootdir/etc/apt/apt.conf.d/00foreigndpkg
                fi
        fi
        rm -f rootdir/etc/apt/apt.conf.d/00foreigndpkg

-       # if multi-arch make sure dpkg can detect itself as capable of it
-       if getarchitectures | grep -E -q '[^ ]+ [^ ]+'; then
-               if [ "0" = "$(dpkg -l dpkg 2> /dev/null | grep '^i' | wc -l)" ]; then
-                       # dpkg doesn't really check the version as long as it is fully installed,
-                       # but just to be sure we choose one above the required version
-                       insertinstalledpackage 'dpkg' "all" '1.16.2+fake'
-               fi
+       # make sure dpkg can detect itself as capable of it
+       if [ "0" = "$(dpkg -l dpkg 2> /dev/null | grep '^i' | wc -l)" ]; then
+               # dpkg doesn't really check the version as long as it is fully installed,
+               # but just to be sure we choose one above the required version
+               insertinstalledpackage 'dpkg' "all" '1.16.2+fake'

        fi
        if dpkg --assert-multi-arch >/dev/null 2>&1 ; then
                local ARCHS="$(getarchitectures)"
        fi
        if dpkg --assert-multi-arch >/dev/null 2>&1 ; then
                local ARCHS="$(getarchitectures)"

diff --git a/test/integration/test-apt-cli-list b/test/integration/test-apt-cli-list
index ca6f86661630b262360794833d4fa8213694535b..f87208a082f692478b562a29ff9e9caa3888b4f5 100755 (executable)
--- a/test/integration/test-apt-cli-list
+++ b/test/integration/test-apt-cli-list
@@ -22,6 +22,7 @@ setupaptarchive
 testsuccessequal "Listing...
 bar/now 1.0 i386 [installed,local]
 baz/unstable 2.0 all [upgradable from: 0.1]
 testsuccessequal "Listing...
 bar/now 1.0 i386 [installed,local]
 baz/unstable 2.0 all [upgradable from: 0.1]

+dpkg/now 1.16.2+fake all [installed,local]

 foo/unstable 1.0 all
 foobar/unstable 2.0 i386 [upgradable from: 1.0]" apt list
 
 foo/unstable 1.0 all
 foobar/unstable 2.0 i386 [upgradable from: 1.0]" apt list
 


@@ -38,6 +39,7 @@ foobar/unstable 2.0 i386 [upgradable from: 1.0]" apt list --upgradable
 testsuccessequal "Listing...
 bar/now 1.0 i386 [installed,local]
 baz/now 0.1 all [installed,upgradable to: 2.0]
 testsuccessequal "Listing...
 bar/now 1.0 i386 [installed,local]
 baz/now 0.1 all [installed,upgradable to: 2.0]

+dpkg/now 1.16.2+fake all [installed,local]

 foobar/now 1.0 i386 [installed,upgradable to: 2.0]" apt list --installed
 
 testsuccessequal "Listing...
 foobar/now 1.0 i386 [installed,upgradable to: 2.0]" apt list --installed
 
 testsuccessequal "Listing...

diff --git a/test/integration/test-apt-move-and-forget-manual-sections b/test/integration/test-apt-move-and-forget-manual-sections
index 4617abab33b51f4e7903c47034b635808da43d75..69a7d9f1d89b3dcc3e5f5a0bd58fd21c3d7f3861 100755 (executable)
--- a/test/integration/test-apt-move-and-forget-manual-sections
+++ b/test/integration/test-apt-move-and-forget-manual-sections
@@ -15,17 +15,17 @@ buildsimplenativepackage 'libdef' 'native' '1' 'unstable' '' '' 'libs'
 setupaptarchive
 
 testmarkedauto
 setupaptarchive
 
 testmarkedauto

-testmarkedmanual
+testmarkedmanual 'dpkg'

 
 testsuccess aptget install libabc/stable -y
 testdpkginstalled 'libabc'
 testdpkgnotinstalled 'libdef'
 
 
 testsuccess aptget install libabc/stable -y
 testdpkginstalled 'libabc'
 testdpkgnotinstalled 'libdef'
 

-testmarkedmanual 'libabc'
+testmarkedmanual 'dpkg' 'libabc'

 testmarkedauto
 
 testsuccess aptget dist-upgrade -y
 testdpkginstalled 'libabc' 'libdef'
 
 testmarkedauto 'libabc'
 testmarkedauto
 
 testsuccess aptget dist-upgrade -y
 testdpkginstalled 'libabc' 'libdef'
 
 testmarkedauto 'libabc'

-testmarkedmanual 'libdef'
+testmarkedmanual 'dpkg' 'libdef'

diff --git a/test/integration/test-apt-update-nofallback b/test/integration/test-apt-update-nofallback
index 60f329a4a0e9c1cfb64091d808c42aa18b223048..47adff33d8303028e6d639ff1a1f4f865fd2786c 100755 (executable)
--- a/test/integration/test-apt-update-nofallback
+++ b/test/integration/test-apt-update-nofallback
@@ -41,7 +41,8 @@ N: See apt-secure(8) manpage for repository creation and user configuration deta
 
 assert_repo_is_intact()
 {
 
 assert_repo_is_intact()
 {

-    testsuccessequal "foo/unstable 2.0 all" apt list -qq
+    testsuccessequal "dpkg/now 1.16.2+fake all [installed,local]
+foo/unstable 2.0 all" apt list -qq

     testsuccess aptget install -y -s foo
     testfailure aptget install -y evil
     testsuccess aptget source foo --print-uris
     testsuccess aptget install -y -s foo
     testfailure aptget install -y evil
     testsuccess aptget source foo --print-uris

diff --git a/test/integration/test-apt-update-rollback b/test/integration/test-apt-update-rollback
index f9c55bc91743669ccbe6bd0621b6bdfeb8bfd8bb..b5471dc6cb6ed4924d0d4df0c68d4c33e8d24b77 100755 (executable)
--- a/test/integration/test-apt-update-rollback
+++ b/test/integration/test-apt-update-rollback
@@ -39,7 +39,8 @@ start_with_good_inrelease() {
     create_fresh_archive
     testsuccess aptget update
     listcurrentlistsdirectory > lists.before
     create_fresh_archive
     testsuccess aptget update
     listcurrentlistsdirectory > lists.before

-    testsuccessequal 'old/unstable 1.0 all' apt list -qq
+    testsuccessequal 'dpkg/now 1.16.2+fake all [installed,local]
+old/unstable 1.0 all' apt list -qq

 }
 
 test_inrelease_to_new_inrelease() {
 }
 
 test_inrelease_to_new_inrelease() {


@@ -48,7 +49,8 @@ test_inrelease_to_new_inrelease() {
 
     add_new_package '+1hour'
     testsuccess aptget update -o Debug::Acquire::Transaction=1
 
     add_new_package '+1hour'
     testsuccess aptget update -o Debug::Acquire::Transaction=1

-    testsuccessequal 'new/unstable 1.0 all
+    testsuccessequal 'dpkg/now 1.16.2+fake all [installed,local]
+new/unstable 1.0 all

 old/unstable 1.0 all' apt list -qq
 }
 
 old/unstable 1.0 all' apt list -qq
 }
 

diff --git a/test/integration/test-bug-728500-tempdir b/test/integration/test-bug-728500-tempdir
index 7497ffcf87cf34112835dd517f07006414d14764..37661d168328b8b60df3b3312ed1d54620dfc891 100755 (executable)
--- a/test/integration/test-bug-728500-tempdir
+++ b/test/integration/test-bug-728500-tempdir
@@ -18,5 +18,6 @@ export TMPDIR=/does-not-exists
 testsuccess aptget update -o Debug::Acquire::gpg=1
 unset TMPDIR
 
 testsuccess aptget update -o Debug::Acquire::gpg=1
 unset TMPDIR
 

-testsuccessequal 'coolstuff' aptcache pkgnames
+testsuccessequal 'coolstuff
+dpkg' aptcache pkgnames

 testsuccess ls rootdir/var/lib/apt/lists/*InRelease
 testsuccess ls rootdir/var/lib/apt/lists/*InRelease

diff --git a/test/integration/test-bug-753297-upgradable b/test/integration/test-bug-753297-upgradable
index f33a6591d487fa36702bdec906a0f31098e2b6b7..353728db02d20c0406d55e75e62955b2e38f4f85 100755 (executable)
--- a/test/integration/test-bug-753297-upgradable
+++ b/test/integration/test-bug-753297-upgradable
@@ -31,4 +31,5 @@ N: There is 1 additional version. Please use the '-a' switch to see it" apt list
 
 testsuccessequal "Listing...
 bar/testing 2 all [upgradable from: 1]
 
 testsuccessequal "Listing...
 bar/testing 2 all [upgradable from: 1]

+dpkg/now 1.16.2+fake all [installed,local]

 foo/testing,now 1 all [installed]" apt list
 foo/testing,now 1 all [installed]" apt list

diff --git a/test/integration/test-external-installation-planner-protocol b/test/integration/test-external-installation-planner-protocol
index 03b2c4831ceca7c6ee784071e576813c124fcff1..1d9abc901a2495db6c5c2377a11b34e5eb0921cb 100755 (executable)
--- a/test/integration/test-external-installation-planner-protocol
+++ b/test/integration/test-external-installation-planner-protocol
@@ -43,7 +43,7 @@ Remove: bar:amd64
 Install: libfoo:amd64 foo:amd64
 Planner: internal' head -n 6 "$EIPPLOG"
 aptinternalplanner < "$EIPPLOG" > planner.log || true
 Install: libfoo:amd64 foo:amd64
 Planner: internal' head -n 6 "$EIPPLOG"
 aptinternalplanner < "$EIPPLOG" > planner.log || true

-testsuccessequal 'Remove: 6
+testsuccessequal 'Remove: 7

 Unpack: 2
 Unpack: 4' grep -e '^Unpack:' -e '^Install:' -e '^Configure:' -e '^Remove:' planner.log
 
 Unpack: 2
 Unpack: 4' grep -e '^Unpack:' -e '^Install:' -e '^Configure:' -e '^Remove:' planner.log