diff options
| author | Julian Andres Klode <jak@debian.org> | 2016-03-17 11:56:31 +0100 |
|---|---|---|
| committer | Julian Andres Klode <jak@debian.org> | 2016-03-17 11:59:32 +0100 |
| commit | dea8713142383aed6906f93e773329f8487d39b1 (patch) | |
| tree | 2b58ab45f65056a3e0b2298f22d7914f9d4c81e1 /test | |
| parent | a38cec81d349525c447004ef8fe9dc942c8bd9bb (diff) | |
| download | apt-dea8713142383aed6906f93e773329f8487d39b1.tar.gz | |
Make test-apt-download-progress less flaky
The test is a bit flaky. In order to get it less flaky, reduce
the speed in each run. To compensate for issues, start with a
higher speed level. Also increase the number of runs to 10.
Furthermore, http get the same multiple-run loop, and the log
files are changed to indicate the protocol being tested, as it's
not obvious which one fails if it fails in quiet mode.
Gbp-Dch: ignore
Diffstat (limited to 'test')
| -rwxr-xr-x | test/integration/test-apt-download-progress | 21 |
1 files changed, 13 insertions, 8 deletions
diff --git a/test/integration/test-apt-download-progress b/test/integration/test-apt-download-progress index ac8c7d15f..9966c7258 100755 --- a/test/integration/test-apt-download-progress +++ b/test/integration/test-apt-download-progress @@ -29,19 +29,24 @@ testsuccess dd if=/dev/zero of=./aptarchive/$TESTFILE bs=800k count=1 OPT='-o APT::Status-Fd=3 -o Debug::pkgAcquire::Worker=1 -o Debug::Acquire::http=1 -o Debug::Acquire::https=1' msgtest 'download progress works via' 'http' -exec 3> apt-progress.log -testsuccess --nomsg apthelper download-file "http://localhost:${APTHTTPPORT}/$TESTFILE" ./downloaded/http-$TESTFILE $OPT -o Acquire::http::Dl-Limit=600 -assertprogress apt-progress.log +for i in 1 2 3 4 5 6 7 8 9 10; do + exec 3> apt-progress-http.log + testsuccess --nomsg apthelper download-file "http://localhost:${APTHTTPPORT}/$TESTFILE" ./downloaded/http-$TESTFILE $OPT -o Acquire::http::Dl-Limit=$((1600/i)) + if [ "$(wc -l apt-progress-http.log | awk '{print $1}')" -ge 3 ]; then + break + fi +done +assertprogress apt-progress-http.log msgtest 'download progress works via' 'https' -for i in 1 2 3 4 5; do - exec 3> apt-progress.log - testsuccess --nomsg apthelper download-file "https://localhost:${APTHTTPSPORT}/$TESTFILE" ./downloaded/https-$TESTFILE $OPT -o Acquire::https::Dl-Limit=600 - if [ "$(wc -l apt-progress.log | awk '{print $1}')" -ge 3 ]; then +for i in 1 2 3 4 5 6 7 8 9 10; do + exec 3> apt-progress-https.log + testsuccess --nomsg apthelper download-file "https://localhost:${APTHTTPSPORT}/$TESTFILE" ./downloaded/https-$TESTFILE $OPT -o Acquire::https::Dl-Limit=$((1600/i)) + if [ "$(wc -l apt-progress-https.log | awk '{print $1}')" -ge 3 ]; then break fi done -assertprogress apt-progress.log +assertprogress apt-progress-https.log # cleanup rm -f apt-progress*.log |