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-resolver-delays-remove-decisions | |
| 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-resolver-delays-remove-decisions')
| -rwxr-xr-x | test/integration/test-resolver-delays-remove-decisions | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/test/integration/test-resolver-delays-remove-decisions b/test/integration/test-resolver-delays-remove-decisions index 8f0c7daa5..a06995476 100755 --- a/test/integration/test-resolver-delays-remove-decisions +++ b/test/integration/test-resolver-delays-remove-decisions @@ -53,7 +53,7 @@ Building dependency tree... MarkInstall foo:amd64 < none -> 1 @un uN Ib > FU=0 Installing foo-dep:amd64 as Depends of foo:amd64 MarkInstall foo-dep:amd64 < none -> 1 @un uN > FU=0 - MarkDelete stuff:amd64 < 1 @ii K > FU=0 + MarkDelete stuff:amd64 < 1 @ii mK > FU=0 Starting pkgProblemResolver with broken count: 0 Starting 2 pkgProblemResolver with broken count: 0 Done @@ -79,11 +79,11 @@ Building dependency tree... MarkInstall foobar:amd64 < none -> 1 @un puN Ib > FU=1 Installing foo:amd64 as Depends of foobar:amd64 Removing: stuff:amd64 as upgrade is not an option for foo:amd64 (1) - MarkDelete stuff:amd64 < 1 @ii K > FU=0 + MarkDelete stuff:amd64 < 1 @ii mK > FU=0 MarkInstall foo:amd64 < none -> 1 @un puN Ib > FU=0 Installing foo-dep:amd64 as Depends of foo:amd64 MarkInstall foo-dep:amd64 < none -> 1 @un puN > FU=0 - MarkInstall uninstallable:amd64 < 1 @ii pK > FU=0 + MarkInstall uninstallable:amd64 < 1 @ii pmK > FU=0 Starting pkgProblemResolver with broken count: 0 Starting 2 pkgProblemResolver with broken count: 0 Done |