diff options
| author | David Kalnischkies <david@kalnischkies.de> | 2016-11-23 17:32:20 +0100 |
|---|---|---|
| committer | David Kalnischkies <david@kalnischkies.de> | 2016-11-24 00:21:35 +0100 |
| commit | 4b10240cca0dc0a4e82e42959545d2ae7e622d29 (patch) | |
| tree | ed7b12303674629b2ee2509bed21920666027d40 /test/integration | |
| parent | dabe9e2482180ada77d2adda2b3c03db22059fb8 (diff) | |
improve arch-unqualified dpkg-progress parsing
Our old idea was to look for the first package which would be "touched"
and take this as the package dpkg is talking about, but that is
incorrect in complicated situations like a package upgraded to/from
multiple M-A:same siblings installed.
As we us the progress report to decide what is still needed we have to
be reasonabily right about the package dpkg is talking about, so we jump
to quite a few loops to get it.
Diffstat (limited to 'test/integration')
| -rwxr-xr-x | test/integration/test-bug-618288-multiarch-same-lockstep | 3 | ||||
| -rwxr-xr-x | test/integration/test-crossgrades | 13 |
2 files changed, 14 insertions, 2 deletions
diff --git a/test/integration/test-bug-618288-multiarch-same-lockstep b/test/integration/test-bug-618288-multiarch-same-lockstep index d9582f6b6..eeecb40ee 100755 --- a/test/integration/test-bug-618288-multiarch-same-lockstep +++ b/test/integration/test-bug-618288-multiarch-same-lockstep @@ -36,3 +36,6 @@ test "$LS_U_AMD" -lt "$LS_C_INT" && msgpass || msgfail msgtest 'Test if' 'libsame:i386 unpack is before libsame:amd64 configure' test "$LS_U_INT" -lt "$LS_C_AMD" && msgpass || msgfail + +# lets see if it really does work out +testsuccess apt dist-upgrade -y diff --git a/test/integration/test-crossgrades b/test/integration/test-crossgrades index d412546c1..30195d30f 100755 --- 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 'crosser' 'i386,armel' '3' 'experimental' 'Multi-Arch: same' setupaptarchive singleinstance() { @@ -43,7 +44,15 @@ multiinstance() { 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' |