From 734eb9ac3f65e38ac3ba7f2d50ea206743a6f611 Mon Sep 17 00:00:00 2001 From: Julian Andres Klode Date: Wed, 8 May 2024 16:14:05 +0200 Subject: test: Ignore progress output in comparing output.. --- test/integration/framework | 1 + 1 file changed, 1 insertion(+) (limited to 'test') diff --git a/test/integration/framework b/test/integration/framework index 98fd7710a..9cb4081ee 100644 --- a/test/integration/framework +++ b/test/integration/framework @@ -1553,6 +1553,7 @@ downloadfile() { cleanup_output() { cat "$1" | sed \ -e '/gpgv: WARNING: This key is not suitable for signing in --compliance=gnupg mode/ d' \ + -e '/...$/ d' \ -e '/^profiling:/ d' \ | sed -e '/\.\.\.profiling:/ {N;s#\.\.\.profiling:.*\n#...#g}' \ >"$2" -- cgit v1.2.3-70-g09d2 From 6f504c0fea67aca176b68ba79490fc811d1371fe Mon Sep 17 00:00:00 2001 From: Julian Andres Klode Date: Wed, 8 May 2024 16:14:18 +0200 Subject: test-allow-scores-for-all-dependency-types: Adjust for solver3 It relies on removing packages, so we must allow it to. To see if it does the right thing, mark all packages automatically installed. --- test/integration/test-allow-scores-for-all-dependency-types | 3 +++ 1 file changed, 3 insertions(+) (limited to 'test') diff --git a/test/integration/test-allow-scores-for-all-dependency-types b/test/integration/test-allow-scores-for-all-dependency-types index 999efc04e..0a527da42 100755 --- a/test/integration/test-allow-scores-for-all-dependency-types +++ b/test/integration/test-allow-scores-for-all-dependency-types @@ -41,6 +41,7 @@ setupaptarchive insertinstalledpackage 'libdb-dev' 'amd64' '5.1.7' 'Depends: libdb5.1-dev' insertinstalledpackage 'libdb5.1-dev' 'amd64' '5.1.29-7' +testsuccess aptmark auto ~i testsuccessequal 'Reading package lists... Building dependency tree... Calculating upgrade... @@ -75,6 +76,7 @@ Conf libdb5.3-dev (5.3.28-3 versioned [amd64])' aptget dist-upgrade -st versione rm -f rootdir/var/lib/dpkg/status insertinstalledpackage 'foo' 'amd64' '1' insertinstalledpackage 'bar' 'amd64' '1' +testsuccess aptmark auto ~i testsuccessequal 'Reading package lists... Building dependency tree... Calculating upgrade... @@ -134,6 +136,7 @@ rm -f rootdir/var/lib/dpkg/status insertinstalledpackage 'gdm3' 'amd64' '1' 'Depends: libaudit0, libaudit0' insertinstalledpackage 'login' 'amd64' '1' 'Essential: yes' insertinstalledpackage 'libaudit0' 'amd64' '1' +testsuccess aptmark auto ~i testsuccessequal 'Reading package lists... Building dependency tree... Calculating upgrade... -- cgit v1.2.3-70-g09d2