diff options
| author | Michael Vogt <mvo@debian.org> | 2015-08-18 11:54:05 +0200 |
|---|---|---|
| committer | Michael Vogt <mvo@debian.org> | 2015-08-18 11:54:05 +0200 |
| commit | 21248c0f00ee71412dbadc6ebf84011cf974346d (patch) | |
| tree | 7dc1f5904399482d2128765b5b86d57a4ac5b3e1 /test/integration/test-bug-735967-lib32-to-i386-unavailable | |
| parent | e5f34ad3b043abf033c1626eb8449b75955d6760 (diff) | |
| parent | 4fc6b7570c3e97b65c118b58cdf6729fa94c9b03 (diff) | |
Merge branch 'debian/experimental' into feature/srv-records
Conflicts:
cmdline/apt-helper.cc
cmdline/makefile
Diffstat (limited to 'test/integration/test-bug-735967-lib32-to-i386-unavailable')
| -rwxr-xr-x | test/integration/test-bug-735967-lib32-to-i386-unavailable | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/test/integration/test-bug-735967-lib32-to-i386-unavailable b/test/integration/test-bug-735967-lib32-to-i386-unavailable index e9f3bf96d..eb6e1a331 100755 --- a/test/integration/test-bug-735967-lib32-to-i386-unavailable +++ b/test/integration/test-bug-735967-lib32-to-i386-unavailable @@ -31,8 +31,9 @@ setupaptarchive --no-update configarchitecture 'amd64' testsuccess aptget update -testequal 'Reading package lists... +testsuccessequal 'Reading package lists... Building dependency tree... +Calculating upgrade... The following packages will be REMOVED: lib32nss-mdns The following packages will be upgraded: @@ -42,7 +43,7 @@ Remv lib32nss-mdns [0.9-1] Inst libnss-mdns [0.9-1] (0.10-6 unstable [amd64]) Conf libnss-mdns (0.10-6 unstable [amd64])' aptget dist-upgrade -s -testequal 'Reading package lists... +testfailureequal 'Reading package lists... Building dependency tree... Some packages could not be installed. This may mean that you have requested an impossible situation or if you are using the unstable @@ -58,8 +59,9 @@ E: Unable to correct problems, you have held broken packages.' aptget install fo configarchitecture 'amd64' 'i386' testsuccess aptget update -testequal 'Reading package lists... +testsuccessequal 'Reading package lists... Building dependency tree... +Calculating upgrade... The following NEW packages will be installed: libnss-mdns:i386 libnss-mdns-i386:i386 The following packages will be upgraded: @@ -74,7 +76,7 @@ Conf libnss-mdns (0.10-6 unstable [amd64]) Conf libnss-mdns-i386:i386 (0.10-6 unstable [i386]) Conf lib32nss-mdns (0.10-6 unstable [amd64])' aptget dist-upgrade -s -testequal 'Reading package lists... +testsuccessequal 'Reading package lists... Building dependency tree... The following extra packages will be installed: libfoo libfoo-bin:i386 |