diff options
| author | Julian Andres Klode <julian.klode@canonical.com> | 2023-11-22 16:22:07 +0100 |
|---|---|---|
| committer | Julian Andres Klode <julian.klode@canonical.com> | 2023-11-22 16:33:45 +0100 |
| commit | b0e336787be8a73280cf4cf037295c6347bcbd83 (patch) | |
| tree | c44ff65d681149bcfb3ddd6082bcf413717418de /test/integration/test-apt-get-upgrade-by-source | |
| parent | 630086a2695ba9d9a6e80145069d82f031f36b2c (diff) | |
Fix the test suite by adding new "m" flags to debug output
In "Restore ?garbage by calling MarkAndSweep before parsing" I
made install code run MarkAndSweep before parsing arguments such
that the "?garbage" pattern works correctly.
This caused test suite breakage because packages now ended up
with marked flags in the debug output. Hence add "m" to the output
we assert where necessary.
In a nicer world we might want to just do MarkAndSweep if we actually
have a ?garbage pattern to evaluate but that is a bit unpredictable
in terms of performance expectations and because a "read-only" construct
modifies the depcache, so let's go with the more expected option for now
Regression-of: b6f362e8013b03efce54e7381e0e22fac1fa1539
Diffstat (limited to 'test/integration/test-apt-get-upgrade-by-source')
| -rwxr-xr-x | test/integration/test-apt-get-upgrade-by-source | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/test/integration/test-apt-get-upgrade-by-source b/test/integration/test-apt-get-upgrade-by-source index 0f87005d3..bac91f04a 100755 --- a/test/integration/test-apt-get-upgrade-by-source +++ b/test/integration/test-apt-get-upgrade-by-source @@ -22,9 +22,9 @@ noprogress() { testsuccessequal "Reading package lists... Building dependency tree... - MarkInstall pkg:arm64 < 1 -> 2 @ii puU > FU=1 - Upgrading pkg-bar:arm64 < 1 | 2 @ii uH > due to pkg:arm64 - Upgrading pkg-foo:arm64 < 1 | 2 @ii uH > due to pkg:arm64 + MarkInstall pkg:arm64 < 1 -> 2 @ii pumU > FU=1 + Upgrading pkg-bar:arm64 < 1 | 2 @ii umH > due to pkg:arm64 + Upgrading pkg-foo:arm64 < 1 | 2 @ii umH > due to pkg:arm64 Starting pkgProblemResolver with broken count: 0 Starting 2 pkgProblemResolver with broken count: 0 Done @@ -42,7 +42,7 @@ Conf pkg-foo (2 unstable [all])" aptget install pkg -o debug::pkgdepcache::marke testsuccessequal "Reading package lists... Building dependency tree... - MarkInstall pkg:arm64 < 1 -> 2 @ii puU > FU=1 + MarkInstall pkg:arm64 < 1 -> 2 @ii pumU > FU=1 Starting pkgProblemResolver with broken count: 0 Starting 2 pkgProblemResolver with broken count: 0 Done |