summaryrefslogtreecommitdiff
path: root/test/integration/test-apt-download-progress
diff options
context:
space:
mode:
Diffstat (limited to 'test/integration/test-apt-download-progress')
-rwxr-xr-xtest/integration/test-apt-download-progress10
1 files changed, 3 insertions, 7 deletions
diff --git a/test/integration/test-apt-download-progress b/test/integration/test-apt-download-progress
index b48e7ebb3..7ac044a57 100755
--- a/test/integration/test-apt-download-progress
+++ b/test/integration/test-apt-download-progress
@@ -11,13 +11,9 @@ setupenvironment
changetohttpswebserver
assertprogress() {
- T="$1"
- testsuccess grep "dlstatus:1:0:Retrieving file 1 of 1" "$T"
- if ! grep -E -q "dlstatus:1:(0\..*|([1-9](\..*)?)|[1-9][0-9](\..*)?):Retrieving file 1 of 1" "$T"; then
- cat "$T"
- msgfail "Failed to detect download progress"
- fi
- testsuccess grep "dlstatus:1:100:Retrieving file 1 of 1" "$T"
+ testsuccess grep "dlstatus:1:0.0000:Retrieving file 1 of 1" "$1"
+ testsuccess grep -E "dlstatus:1:[1-9][0-9]{0,1}\.[0-9]{1,4}:Retrieving file 1 of 1" "$1"
+ testsuccess grep "dlstatus:1:100.0000:Retrieving file 1 of 1" "$1"
}
# we need to ensure the file is reasonable big so that apt has a chance to