summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorJulian Andres Klode <jak@debian.org>2016-03-27 15:12:05 +0200
committerJulian Andres Klode <jak@debian.org>2016-03-27 15:14:32 +0200
commitf46a1d944896778ca705936e58a19a3a28bd1b95 (patch)
treeaeddbbd419f9e3fc08943a3d40b54f61c435494e /test
parentcf2d4e7c4ddce2677e22c2ba7599bc8996b1993a (diff)
test-apt-update-reporting: Make more use of framework
Use msgtest and testsuccess with a function instead of failing with a simple exit 1. This looks nicer. Gbp-Dch: ignore
Diffstat (limited to 'test')
-rwxr-xr-xtest/integration/test-apt-update-reporting28
1 files changed, 16 insertions, 12 deletions
diff --git a/test/integration/test-apt-update-reporting b/test/integration/test-apt-update-reporting
index bc1d119a1..cecf23ab2 100755
--- a/test/integration/test-apt-update-reporting
+++ b/test/integration/test-apt-update-reporting
@@ -16,16 +16,20 @@ changetowebserver
aptget update -o Debug::Acquire::Progress=1 2>progress.log >ignore.out
-prev_percent=0.0
-while read line; do
- percent="$(echo "$line"|cut -b2-6)"
- # need to cut the decimal point and digits because sh can not do
- # float compare
- if [ "${percent%%.*}" -lt "${prev_percent%%.*}" ]; then
- echo "progress goes backwards"
- cat progress.log
- exit 1
- fi
- prev_percent="$percent"
-done < progress.log
+has_progress() {
+ prev_percent=0.0
+ while read line; do
+ percent="$(echo "$line"|cut -b2-6)"
+ # need to cut the decimal point and digits because sh can not do
+ # float compare
+ if [ "${percent%%.*}" -lt "${prev_percent%%.*}" ]; then
+ cat progress.log
+ return 1
+ fi
+ prev_percent="$percent"
+ done < progress.log
+ return 0
+}
+msgtest "Testing that progress does not go backward"
+testsuccess --nomsg has_progress