From 226c0f64d46019d675840b16bd44ff985b45ad0f Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Tue, 1 Sep 2015 02:29:27 +0200 Subject: improve CheckDropPrivsMustBeDisabled further Various smaller improvements so that the check deals better with already downloaded files, relative paths and other things. Git-Dch: Ignore --- test/integration/test-http-pipeline-messup | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) (limited to 'test/integration') diff --git a/test/integration/test-http-pipeline-messup b/test/integration/test-http-pipeline-messup index dda8ef7eb..a00182150 100755 --- a/test/integration/test-http-pipeline-messup +++ b/test/integration/test-http-pipeline-messup @@ -27,18 +27,26 @@ Debug::pkgAcquire::Worker "true";' > rootdir/etc/apt/apt.conf.d/99debug testsuccess aptget update -# messup is bigger than pipeline: checks if fixup isn't trying to hard +cd downloaded +# messup is bigger than pipeline: checks if fixup isn't trying too hard testfailure aptget download pkga pkgb pkgc pkgd -o Acquire::http::Pipeline-Depth=2 -testfailure test -f pkga_1.0_all.deb +for pkg in 'pkga' 'pkgd'; do + testfailure test -f ${pkg}_1.0_all.deb +done +for pkg in 'pkgb' 'pkgc'; do + testsuccess test -f ${pkg}_1.0_all.deb + testsuccess cmp ../incoming/${pkg}_1.0_all.deb ${pkg}_1.0_all.deb + rm -f ${pkg}_1.0_all.deb +done # ensure that pipeling is enabled for rest of this test -echo 'Acquire::http::Pipeline-Depth 10;' > rootdir/etc/apt/apt.conf.d/99enable-pipeline +echo 'Acquire::http::Pipeline-Depth 10;' > ../rootdir/etc/apt/apt.conf.d/99enable-pipeline # the output is a bit strange: it looks like it has downloaded pkga 4 times testwarning aptget download pkga pkgb pkgc pkgd for pkg in 'pkga' 'pkgb' 'pkgc' 'pkgd'; do testsuccess test -f ${pkg}_1.0_all.deb - testsuccess cmp incoming/${pkg}_1.0_all.deb ${pkg}_1.0_all.deb + testsuccess cmp ../incoming/${pkg}_1.0_all.deb ${pkg}_1.0_all.deb rm -f ${pkg}_1.0_all.deb done -- cgit v1.2.3