From 419190f6c17aaf750887ec7471599681377fb01b Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Sat, 13 Jun 2020 11:45:38 +0200 Subject: Tell EDSP solvers about all installed pkgs ignoring arch We usually tell EDSP solvers only about architectures we are configured to treat as native/foreign, but the system could have packages from other architectures installed (even if very unlikely) which could influence the solution (e.g. requiring a removal) so we make sure to tell them. --- test/integration/test-external-dependency-solver-protocol | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'test') diff --git a/test/integration/test-external-dependency-solver-protocol b/test/integration/test-external-dependency-solver-protocol index 39c9cf58f..33d78be2a 100755 --- a/test/integration/test-external-dependency-solver-protocol +++ b/test/integration/test-external-dependency-solver-protocol @@ -294,6 +294,9 @@ exit 1" 'E: External solver failed with: This solver exits instantly E: Sub-process exit1withmsg returned an error code (1)' configarchitecture 'amd64' 'i386' +for arch in 'amd64' 'i386' 'armel' 'armhf'; do + insertinstalledpackage "dummy-httpd-$arch" "$arch" '1' 'Provides: httpd' +done buildsimplenativepackage 'dummy-webserver' 'all' '1' 'unstable' 'Provides: httpd Multi-Arch: foreign' testfailure apt install -s dummy-webserver @@ -307,6 +310,10 @@ testequal 'Reverse Depends: Dependencies: 1 - Provides: -1 - ./incoming/dummy-webserver_1_all.deb (= 1) httpd (= ) +1 - ./incoming/dummy-webserver_1_all.deb (= 1) httpd:armhf (= ) httpd:armel (= ) httpd:i386 (= ) httpd (= ) Reverse Provides: ' tail -n 6 showpkg.output -testsuccessequal 'Provides: httpd' grep 'Provides:' "$APT_EDSP_DUMP_FILENAME" +testsuccessequal 'Provides: httpd, httpd, httpd, httpd +Provides: httpd +Provides: httpd +Provides: httpd +Provides: httpd' grep 'Provides:' "$APT_EDSP_DUMP_FILENAME" -- cgit v1.2.3