diff options
| author | Michael Vogt <mvo@ubuntu.com> | 2016-03-15 14:50:37 +0100 |
|---|---|---|
| committer | Michael Vogt <mvo@debian.org> | 2016-03-16 17:52:40 +0100 |
| commit | fb193b1cd43f0e8c3b7e5f69f183b9abe7e83761 (patch) | |
| tree | f0ef684a93cf8f18ee95e1b4acc635a6722ac7b4 /test/integration/test-apt-update-not-modified | |
| parent | 8e0c56db82fe10b0f8ceadf3187ffc672eaaff3a (diff) | |
Get accurate progress reporting in apt update again
For the non-pdiff case, we have can have accurate progress
reporting because after fetching the {,In}Release files we know
how many IndexFiles will be fetched and what size they have.
Therefore init the filesize early (in pkgAcqIndex::Init) and
ensure that in Acquire::Pulse() looks at already downloaded
bits when calculating the progress in Acquire::Pulse.
Also improve debug output of Debug::acquire::progress
Diffstat (limited to 'test/integration/test-apt-update-not-modified')
| -rwxr-xr-x | test/integration/test-apt-update-not-modified | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/test/integration/test-apt-update-not-modified b/test/integration/test-apt-update-not-modified index 82e69d5d5..ce3bc0dd3 100755 --- a/test/integration/test-apt-update-not-modified +++ b/test/integration/test-apt-update-not-modified @@ -34,6 +34,7 @@ Reading package lists..." aptget update # readd arch so its downloaded again… configarchitecture 'amd64' 'i386' # … but oh noes, hashsum mismatch! + SIZE=$(stat -c '%s' 'aptarchive/dists/unstable/main/binary-amd64/Packages.gz') find aptarchive/dists/unstable/main/binary-amd64/ -type f -delete cat >> aptarchive/dists/unstable/main/binary-amd64/Packages <<EOF @@ -43,7 +44,7 @@ Version: 1 EOF compressfile aptarchive/dists/unstable/main/binary-amd64/Packages testfailureequal "Hit:1 $1 unstable InRelease -Get:2 $1 unstable/main amd64 Packages [$(stat -c '%s' 'aptarchive/dists/unstable/main/binary-amd64/Packages.gz') B] +Get:2 $1 unstable/main amd64 Packages [$SIZE B] Err:2 $1 unstable/main amd64 Packages Hash Sum mismatch Reading package lists... @@ -92,6 +93,7 @@ Reading package lists..." aptget update # readd arch so its downloaded again… configarchitecture 'amd64' 'i386' # … but oh noes, hashsum mismatch! + SIZE=$(stat -c '%s' 'aptarchive/dists/unstable/main/binary-amd64/Packages.gz') find aptarchive/dists/unstable/main/binary-amd64/ -type f -delete cat >> aptarchive/dists/unstable/main/binary-amd64/Packages <<EOF @@ -103,7 +105,7 @@ EOF testfailureequal "Ign:1 $1 unstable InRelease 404 Not Found Hit:2 $1 unstable Release -Get:4 $1 unstable/main amd64 Packages [$(stat -c '%s' 'aptarchive/dists/unstable/main/binary-amd64/Packages.gz') B] +Get:4 $1 unstable/main amd64 Packages [$SIZE B] Err:4 $1 unstable/main amd64 Packages Hash Sum mismatch Reading package lists... |