diff options
| author | Julian Andres Klode <julian.klode@canonical.com> | 2025-02-18 16:39:10 +0100 |
|---|---|---|
| committer | Julian Andres Klode <julian.klode@canonical.com> | 2025-02-18 16:39:10 +0100 |
| commit | d2ce308082886c50d0ef47efa5a277370603fac1 (patch) | |
| tree | 616fbd3d84e81c2a50cad68bab5f6538b683492c /test/integration | |
| parent | f82dcd7e4ebb3f70d28e9feb3621676f8c0cc024 (diff) | |
| parent | 815d5b01bf9be1d476b110050b20ae980c76d4a8 (diff) | |
Merge branch 'solver3'
Diffstat (limited to 'test/integration')
| -rw-r--r-- | test/integration/framework | 17 | ||||
| -rw-r--r-- | test/integration/solver3.broken | 1 |
2 files changed, 5 insertions, 13 deletions
diff --git a/test/integration/framework b/test/integration/framework index 3784ece06..35c1a1032 100644 --- a/test/integration/framework +++ b/test/integration/framework @@ -1555,22 +1555,15 @@ 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' \ - | sed -e '/\.\.\.profiling:/ {N;s#\.\.\.profiling:.*\n#...#g}' \ - | cleanup_solver3_pipe \ + -e '/\.\.\.profiling:/ {N;s#\.\.\.profiling:.*\n#...#g}' \ + -e '/^Solving dependencies\.\.\.$/ d' \ + -e '/^Calculating upgrade\.\.\.$/ d' \ + -e 's/Solving dependencies\.\.\.//' \ + -e 's/Calculating upgrade\.\.\.//' \ >"$2" } diff --git a/test/integration/solver3.broken b/test/integration/solver3.broken index 2ad00555b..4a4e1532b 100644 --- a/test/integration/solver3.broken +++ b/test/integration/solver3.broken @@ -1,7 +1,6 @@ test-allow-scores-for-all-dependency-types # TBD: We are lacking single-sided conflicts preferences test-apt-get-upgrade-by-source # TBD: Upgrading by source is not supported yet, mostly same issue as above test-apt-install-order-matters-a-bit # Wontfix: Cannot fix, the order is not recorded in the depcache -test-apt-move-and-forget-manual-sections # TBD: Moving the auto bit is not implemented test-bug-470115-new-and-tighten-recommends # TBD: Calculation of what is already satisfied Recommends is broken test-prevent-markinstall-multiarch-same-versionscrew # TBD: We consider the skewed ones obsolete and remove them... test-resolve-by-keep-new-recommends # TBD: Fixing this seems to break test-bug-591882-conkeror, why? |