Просмотр исходного кода

test-acquire-same-file-multiple-times: Run failing test up to 10 times

This should make the test less flaky and hopefully fix the failure
on Ubuntu's armhf CI nodes.

Gbp-Dch: ignore
Julian Andres Klode лет назад: 10
Родитель
Сommit
c030cc931e
1 измененных файлов с 11 добавлено и 5 удалено
  1. 11 5
      test/integration/test-acquire-same-file-multiple-times

+ 11 - 5
test/integration/test-acquire-same-file-multiple-times

@@ -58,11 +58,17 @@ testrun 'httpdown'
 
 
 httpredirectdown() {
 httpredirectdown() {
 	msgtest 'Redirect leads' 'first URI to the second URI'
 	msgtest 'Redirect leads' 'first URI to the second URI'
-	testsuccess --nomsg apthelper download-file "http://localhost:${APTHTTPPORT}/foo2" "./downloaded/foo1" '' \
-		"http://localhost:${APTHTTPPORT}/foo" './downloaded/foo2' '' -o Debug::pkgAcquire::Worker=1 -o Debug::Acquire::http=1
-	cp rootdir/tmp/testsuccess.output download.log
-	testsuccess cmp "$TESTDIR/framework" ./downloaded/foo1
-	testsuccess cmp ./downloaded/foo1 ./downloaded/foo2
+	for i in 1 2 3 4 5 6 7 8 9 10; do
+		testsuccess --nomsg apthelper download-file "http://localhost:${APTHTTPPORT}/foo2" "./downloaded/foo1" '' \
+			"http://localhost:${APTHTTPPORT}/foo" './downloaded/foo2' '' -o Debug::pkgAcquire::Worker=1 -o Debug::Acquire::http=1
+		cp rootdir/tmp/testsuccess.output download.log
+		testsuccess cmp "$TESTDIR/framework" ./downloaded/foo1
+		testsuccess cmp ./downloaded/foo1 ./downloaded/foo2
+
+		if grep -q '103%20Redirect' ./download.log; then
+			break
+		fi
+	done
 	testequal '1' grep -c '200%20URI%20Start' ./download.log
 	testequal '1' grep -c '200%20URI%20Start' ./download.log
 	testequal '1' grep -c '103%20Redirect' ./download.log
 	testequal '1' grep -c '103%20Redirect' ./download.log
 	testequal '1' grep -c '201%20URI%20Done' ./download.log
 	testequal '1' grep -c '201%20URI%20Done' ./download.log