diff options
| author | David Kalnischkies <david@kalnischkies.de> | 2016-05-14 10:43:03 +0200 |
|---|---|---|
| committer | David Kalnischkies <david@kalnischkies.de> | 2016-05-16 16:17:54 +0200 |
| commit | eb1f04dda07c2b69549ad9fd793cca0e91841b3e (patch) | |
| tree | 473136bd9eb4161f1201b746c1ed0a21c357aa27 /test/integration | |
| parent | fd78974020e23679e9e810cf01dc5c8f3012bb8a (diff) | |
show final solution in --no-download --fix-missing mode
This commit moves the creation of the fetcher and with it the
calculation of the filenames before the code generation the various
lists detailing the solution. This means that simulation comes even so
slightly closer to a real run as it will require and parse the package
indexes for filenames and queuing of URIs, so that a simulation "using"
an unavailable download method actually fails now.
The real benefit of this change is through that the rather special but
nontheless handy --no-download --fix-missing mode now actually shows
what the solution is it will apply to the system rather than the
solution it would if it could download all not-downloaded packages.
Diffstat (limited to 'test/integration')
| -rwxr-xr-x | test/integration/test-bug-602412-dequote-redirect | 17 | ||||
| -rwxr-xr-x | test/integration/test-compressed-indexes | 2 |
2 files changed, 18 insertions, 1 deletions
diff --git a/test/integration/test-bug-602412-dequote-redirect b/test/integration/test-bug-602412-dequote-redirect index 3d88baaef..b4da876cb 100755 --- a/test/integration/test-bug-602412-dequote-redirect +++ b/test/integration/test-bug-602412-dequote-redirect @@ -7,6 +7,8 @@ setupenvironment configarchitecture 'amd64' buildsimplenativepackage 'unrelated' 'all' '0.5~squeeze1' 'unstable' +buildsimplenativepackage 'unrelated2' 'all' '0.5~squeeze1' 'unstable' +insertinstalledpackage 'unrelated2' 'all' '0.1' setupaptarchive --no-update changetowebserver -o aptwebserver::redirect::replace::/pool/=/newpool/ \ @@ -42,3 +44,18 @@ for CODE in 301 302 307; do testrun "$CODE" "https://localhost:${APTHTTPSPORT}" rm -rf rootdir/var/lib/apt/lists rootdir/var/cache/apt/archives done + +testsuccess apt update +testsuccess aptget install unrelated --download-only +testsuccessequal 'Reading package lists... +Building dependency tree... +Calculating upgrade... +The following NEW packages will be installed: + unrelated +The following packages have been kept back: + unrelated2 +0 upgraded, 1 newly installed, 0 to remove and 1 not upgraded. +Inst unrelated (0.5~squeeze1 unstable [all]) +Conf unrelated (0.5~squeeze1 unstable [all])' aptget dist-upgrade unrelated --no-download --fix-missing -s +testsuccess aptget dist-upgrade unrelated --no-download --fix-missing -y +testdpkginstalled unrelated diff --git a/test/integration/test-compressed-indexes b/test/integration/test-compressed-indexes index 7ddf2e2e2..d544ac89f 100755 --- a/test/integration/test-compressed-indexes +++ b/test/integration/test-compressed-indexes @@ -70,7 +70,7 @@ The following NEW packages will be installed: testpkg 0 upgraded, 1 newly installed, 0 to remove and 0 not upgraded. Inst testpkg (1.0 unstable [i386]) -Conf testpkg (1.0 unstable [i386])' aptget install testpkg -s +Conf testpkg (1.0 unstable [i386])' aptget install testpkg -s -o Debug::pkgAcquire::Auth=0 -o Debug::pkgAcquire::Worker=0 rm -f rootdir/var/cache/apt/pkgcache.bin rootdir/var/cache/apt/srcpkgcache.bin testsuccessequal "$GOODSHOW" aptcache show testpkg testsuccessequal "$GOODSHOW" aptcache show testpkg |