diff options
| author | Julian Andres Klode <julian.klode@canonical.com> | 2024-05-20 13:17:35 +0200 |
|---|---|---|
| committer | Julian Andres Klode <julian.klode@canonical.com> | 2024-05-24 13:43:56 +0200 |
| commit | 0c700522df1c96fd591020e7b3e29bc7e36dec14 (patch) | |
| tree | 80d455c8602e1b4d338b334149102cfacf66cd75 /test | |
| parent | 1fbdc04be7547b8c4bb84f400329415ea0bc60b5 (diff) | |
test: Temporarily ignore autoremovable lists for solver3
We do not show them yet, so let's ignore them so we can focus
on getting the rest of the tests to work.
Diffstat (limited to 'test')
| -rw-r--r-- | test/integration/framework | 12 | ||||
| -rw-r--r-- | test/integration/solver3.broken | 1 |
2 files changed, 11 insertions, 2 deletions
diff --git a/test/integration/framework b/test/integration/framework index 54bc4da07..e13888da2 100644 --- a/test/integration/framework +++ b/test/integration/framework @@ -1559,12 +1559,22 @@ downloadfile() { fi } +cleanup_solver3_pipe() { + if [ "$APT_SOLVER" != "3.0" ]; then + cat + else + # FIXME: We do not have support for listing autoremovals yet. + # FIXME: Progress output is different + sed -e '/Solving dependencies\.\.\./ d' \ + -e "/no longer required[.:]$/,/^Use '.* autoremove'/ d" + fi +} cleanup_output() { cat "$1" | sed \ -e '/gpgv: WARNING: This key is not suitable for signing in --compliance=gnupg mode/ d' \ -e '/^profiling:/ d' \ - -e '/Solving dependencies\.\.\./ d' \ | sed -e '/\.\.\.profiling:/ {N;s#\.\.\.profiling:.*\n#...#g}' \ + | cleanup_solver3_pipe \ >"$2" } diff --git a/test/integration/solver3.broken b/test/integration/solver3.broken index 020335238..96238232c 100644 --- a/test/integration/solver3.broken +++ b/test/integration/solver3.broken @@ -60,7 +60,6 @@ test-external-installation-planner-protocol test-handling-broken-orgroups test-ignore-provides-if-versioned-breaks test-ignore-provides-if-versioned-conflicts -test-kernel-helper-autoremove test-method-mirror test-multiarch-allowed test-multiarch-barbarian |