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

5 files changed, 25 insertions, 25 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
diff --git a/test/integration/test-bug-618848-always-respect-user-requests b/test/integration/test-bug-618848-always-respect-user-requests
index f77c384c2..225db299c 100755
--- a/test/integration/test-bug-618848-always-respect-user-requests
+++ b/test/integration/test-bug-618848-always-respect-user-requests
@@ -15,11 +15,11 @@ setupaptarchive
 
 testsuccessequal "Reading package lists...
 Building dependency tree...
-  MarkDelete libdb4.8:i386 < 1.0 @ii pK > FU=1
-  MarkDelete exim4-daemon-light:i386 < 1.0 @ii K Ib > FU=0
-    MarkInstall exim4-daemon-heavy:i386 < none -> 1.0 @un uN Ib > FU=0
-      exim4-daemon-heavy:i386 Depends on libdb4.8:i386 < 1.0 @ii pR > can't be satisfied! (dep)
-  MarkDelete exim4:i386 < 1.0 @ii K Ib > FU=0
+  MarkDelete libdb4.8:i386 < 1.0 @ii pmK > FU=1
+  MarkDelete exim4-daemon-light:i386 < 1.0 @ii mK Ib > FU=0
+    MarkInstall exim4-daemon-heavy:i386 < none -> 1.0 @un umN Ib > FU=0
+      exim4-daemon-heavy:i386 Depends on libdb4.8:i386 < 1.0 @ii pmR > can't be satisfied! (dep)
+  MarkDelete exim4:i386 < 1.0 @ii mK Ib > FU=0
 The following packages will be REMOVED:
   exim4 exim4-daemon-light libdb4.8
   MarkDelete exim4:i386 < 1.0 @ii K > FU=1
diff --git a/test/integration/test-bug-960705-propagate-protected-to-satisfied-conflict b/test/integration/test-bug-960705-propagate-protected-to-satisfied-conflict
index c16a27569..272378b01 100755
--- a/test/integration/test-bug-960705-propagate-protected-to-satisfied-conflict
+++ b/test/integration/test-bug-960705-propagate-protected-to-satisfied-conflict
@@ -18,24 +18,24 @@ setupaptarchive
 testsuccessequal "Reading package lists...
 Building dependency tree...
    Removing: systemd-sysv:amd64 as upgrade is not an option for runit-init:amd64 (1)
-    MarkDelete systemd-sysv:amd64 < 1 @ii K > FU=0
+    MarkDelete systemd-sysv:amd64 < 1 @ii mK > FU=0
   MarkInstall runit-init:amd64 < none -> 1 @un puN > FU=1
 Starting pkgProblemResolver with broken count: 1
 Starting 2 pkgProblemResolver with broken count: 1
-Investigating (0) init:amd64 < 1 @ii K Ib >
-Broken init:amd64 PreDepends on systemd-sysv:amd64 < 1 @ii pR >
+Investigating (0) init:amd64 < 1 @ii mK Ib >
+Broken init:amd64 PreDepends on systemd-sysv:amd64 < 1 @ii pmR >
   Considering systemd-sysv:amd64 0 as a solution to init:amd64 5100
   Added systemd-sysv:amd64 to the remove list
-Broken init:amd64 PreDepends on sysvinit-core:amd64 < none @un pH >
+Broken init:amd64 PreDepends on sysvinit-core:amd64 < none @un pmH >
   Considering sysvinit-core:amd64 0 as a solution to init:amd64 5100
-  Ignore MarkKeep of systemd-sysv:amd64 < 1 @ii pR > as its mode (Delete) is protected
-Investigating (1) init:amd64 < 1 @ii K Ib >
-Broken init:amd64 PreDepends on systemd-sysv:amd64 < 1 @ii pR >
+  Ignore MarkKeep of systemd-sysv:amd64 < 1 @ii pmR > as its mode (Delete) is protected
+Investigating (1) init:amd64 < 1 @ii mK Ib >
+Broken init:amd64 PreDepends on systemd-sysv:amd64 < 1 @ii pmR >
   Considering systemd-sysv:amd64 5100 as a solution to init:amd64 5100
-Broken init:amd64 PreDepends on sysvinit-core:amd64 < none @un pH >
+Broken init:amd64 PreDepends on sysvinit-core:amd64 < none @un pmH >
   Considering sysvinit-core:amd64 0 as a solution to init:amd64 5100
   Or group remove for init:amd64
-  MarkDelete init:amd64 < 1 @ii K Ib > FU=0
+  MarkDelete init:amd64 < 1 @ii mK Ib > FU=0
 Done
 The following packages will be REMOVED:
   init systemd-sysv
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
diff --git a/test/integration/test-ubuntu-bug-1974196 b/test/integration/test-ubuntu-bug-1974196
index 040f0b3fd..7c38723c6 100755
--- a/test/integration/test-ubuntu-bug-1974196
+++ b/test/integration/test-ubuntu-bug-1974196
@@ -22,11 +22,11 @@ noprogress() {
 
 testsuccessequal "Reading package lists...
 Building dependency tree...
-   Upgrading: depends:arm64 < 1 | 2 @ii uH Ib > due to depends:arm64 Depends on pkg0:arm64 < 1 -> 2 @ii puU > (= 1)
-  MarkInstall pkg0:arm64 < 1 -> 2 @ii puU > FU=1
-    MarkInstall depends:arm64 < 1 -> 2 @ii uU Ib > FU=0
+   Upgrading: depends:arm64 < 1 | 2 @ii umH Ib > due to depends:arm64 Depends on pkg0:arm64 < 1 -> 2 @ii pumU > (= 1)
+  MarkInstall pkg0:arm64 < 1 -> 2 @ii pumU > FU=1
+    MarkInstall depends:arm64 < 1 -> 2 @ii umU Ib > FU=0
     Installing pkg1:arm64 as Depends of depends:arm64
-      MarkInstall pkg1:arm64 < 1 -> 2 @ii uU > FU=0
+      MarkInstall pkg1:arm64 < 1 -> 2 @ii umU > FU=0
 Starting pkgProblemResolver with broken count: 0
 Starting 2 pkgProblemResolver with broken count: 0
 Done