diff options
| author | Julian Andres Klode <jak@debian.org> | 2024-05-14 10:26:45 +0000 |
|---|---|---|
| committer | Julian Andres Klode <jak@debian.org> | 2024-05-14 10:26:45 +0000 |
| commit | 422fb4f9637d0164dec9e55dc3df56c89af65a64 (patch) | |
| tree | 3fef52a852123c958314cd2d2a4ec319a58b1523 /test/integration | |
| parent | 6d96601ede7164620cc404ef8ead7d72c3010b8d (diff) | |
| parent | d2323b179c4fafa0424177a8c702166722384b14 (diff) | |
Merge branch 'solver3' into 'main'
Initial implementation of the 3.0 solver
See merge request apt-team/apt!347
Diffstat (limited to 'test/integration')
| -rw-r--r-- | test/integration/framework | 1 | ||||
| -rwxr-xr-x | test/integration/test-allow-scores-for-all-dependency-types | 3 |
2 files changed, 4 insertions, 0 deletions
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" 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... |