improve arch-unqualified dpkg-progress parsing

[apt.git] / test / integration / test-crossgrades

diff --git a/test/integration/test-crossgrades b/test/integration/test-crossgrades
index d412546c1b1dda1d1f02445f6276e73aa0cec2ea..30195d30f1c6c4403bb5456e88bb3ec4deeb09d9 100755 (executable)
--- a/test/integration/test-crossgrades
+++ b/test/integration/test-crossgrades
@@ -11,6 +11,7 @@ configdpkgnoopchroot
 buildsimplenativepackage 'unrelated' 'amd64' '1' 'stable'
 buildsimplenativepackage 'crosser' 'i386,armel' '1' 'stable' 'Multi-Arch: same'
 buildsimplenativepackage 'crosser' 'amd64' '2' 'unstable'
 buildsimplenativepackage 'unrelated' 'amd64' '1' 'stable'
 buildsimplenativepackage 'crosser' 'i386,armel' '1' 'stable' 'Multi-Arch: same'
 buildsimplenativepackage 'crosser' 'amd64' '2' 'unstable'

+buildsimplenativepackage 'crosser' 'i386,armel' '3' 'experimental' 'Multi-Arch: same'

 setupaptarchive
 
 singleinstance() {
 setupaptarchive
 
 singleinstance() {


@@ -43,7 +44,15 @@ multiinstance() {
        testdpkgnotinstalled 'crosser:i386' 'crosser:armel' 'unrelated'
        testdpkginstalled 'crosser:amd64'
 
        testdpkgnotinstalled 'crosser:i386' 'crosser:armel' 'unrelated'
        testdpkginstalled 'crosser:amd64'
 

-       testsuccess apt purge crosser:amd64 -y --planner $1
-       testdpkgnotinstalled 'crosser:amd64'
+       testsuccess apt install crosser:i386 crosser:armel -t experimental -y -o Debug::pkgDpkgPm=1 -o Dpkg::Use-Pty=0 --purge --planner $1
+       cp -a rootdir/tmp/testsuccess.output crosser.output
+       testsuccess grep -- '--remove.*crosser.*' crosser.output
+       testsuccess grep -- '--purge' crosser.output
+       testsuccess apt install crosser:i386 crosser:armel -t experimental -y -o Debug::pkgDPkgProgressReporting=1 -o Dpkg::Use-Pty=0 --purge --planner $1
+       testdpkgnotinstalled 'crosser:amd64' 'unrelated'
+       testdpkginstalled 'crosser:i386' 'crosser:armel'
+
+       testsuccess apt purge crosser:i386 crosser:armel -y --planner $1
+       testdpkgnotinstalled 'crosser:i386' 'crosser:armel' 'unrelated'

 }
 multiinstance 'internal'
 }
 multiinstance 'internal'