From 851b6a097165af4d51c0db01b5e05256e5006896 Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel.baumann@progress-linux.org>
Date: Sun, 7 Apr 2024 11:00:48 +0200
Subject: Adding upstream version 2.6.1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
---
 test/integration/skip-apt-download-progress | 48 +++++++++++++++++++++++++++++
 1 file changed, 48 insertions(+)
 create mode 100755 test/integration/skip-apt-download-progress

(limited to 'test/integration/skip-apt-download-progress')

diff --git a/test/integration/skip-apt-download-progress b/test/integration/skip-apt-download-progress
new file mode 100755
index 0000000..13a18f7
--- /dev/null
+++ b/test/integration/skip-apt-download-progress
@@ -0,0 +1,48 @@
+#!/bin/sh
+#
+# ensure downloading sends progress as a regression test for commit 9127d7ae
+#
+set -e
+
+TESTDIR="$(readlink -f "$(dirname "$0")")"
+. "$TESTDIR/framework"
+
+setupenvironment
+changetohttpswebserver
+
+assertprogress() {
+    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
+# actually report progress - but not too big to ensure its not delaying the
+# test too much
+TESTFILE=testfile.big
+testsuccess dd if=/dev/zero of=./aptarchive/$TESTFILE bs=1600k 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'
+for i in 2 5 7 10 12 15; 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 2 5 7 10 12 15; 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-https.log
+
+# cleanup
+rm -f apt-progress*.log
-- 
cgit v1.2.3