do delay the test for http, too, to make it more reliable

[apt.git] / test / integration / test-sourceslist-trusted-options

diff --git a/test/integration/test-sourceslist-trusted-options b/test/integration/test-sourceslist-trusted-options
index c954f2f4f0aa1be977e25d88e638412345e63ca0..86036e2427351fac78d40bb40be9ea121945b804 100755 (executable)
--- a/test/integration/test-sourceslist-trusted-options
+++ b/test/integration/test-sourceslist-trusted-options
@@ -15,11 +15,12 @@ setupaptarchive --no-update
 APTARCHIVE=$(readlink -f ./aptarchive)
 
 everythingsucceeds() {
-       testequal 'Listing...
+       testsuccessequal 'Listing...
 foo/testing 2 amd64
 foo/stable 1 amd64
 ' apt list foo -a
 
+       cd downloaded
        rm -f foo_1_amd64.deb foo_2_amd64.deb
        testsuccess aptget download foo "$@"
        testsuccess test -s foo_1_amd64.deb -o -s foo_2_amd64.deb
@@ -27,10 +28,11 @@ foo/stable 1 amd64
        rm -f foo_1.dsc foo_2.dsc
        testsuccess aptget source foo --dsc-only -d "$@"
        testsuccess test -s foo_1.dsc -o -s foo_2.dsc
+       cd - >/dev/null
 }
 
 everythingfails() {
-       testequal 'Listing...
+       testsuccessequal 'Listing...
 foo/testing 2 amd64
 foo/stable 1 amd64
 ' apt list foo -a
@@ -39,32 +41,36 @@ foo/stable 1 amd64
   foo
 E: Some packages could not be authenticated'
 
+       cd downloaded
        rm -f foo_1_amd64.deb foo_2_amd64.deb
        testfailure aptget download foo "$@"
-       testequal "$WARNING" tail -n 3 rootdir/tmp/testfailure.output
+       testequal "$WARNING" tail -n 3 ../rootdir/tmp/testfailure.output
        testfailure test -s foo_1_amd64.deb -o -s foo_2_amd64.deb
 
        rm -f foo_1.dsc foo_2.dsc
        testfailure aptget source foo --dsc-only -d "$@"
-       testequal "$WARNING" tail -n 3 rootdir/tmp/testfailure.output
+       testequal "$WARNING" tail -n 3 ../rootdir/tmp/testfailure.output
        testfailure test -s foo_1.dsc -o -s foo_2.dsc
+       cd - >/dev/null
 }
 
 cp -a rootdir/etc/apt/sources.list.d/ rootdir/etc/apt/sources.list.d.bak/
+echo 'Debug::Acquire::Transaction "true";
+Debug::pkgAcquire::Worker "true";' > rootdir/etc/apt/apt.conf.d/00debugging
 
 aptgetupdate() {
        rm -rf rootdir/var/lib/apt/lists
        # note that insecure with trusted=yes are allowed
        # as the trusted=yes indicates that security is provided by
        # something above the understanding of apt
-       testsuccess aptget update --no-allow-insecure-repositories
+       ${1:-testsuccess} aptget update --no-allow-insecure-repositories
 }
 
 insecureaptgetupdate() {
        rm -rf rootdir/var/lib/apt/lists
        testfailure aptget update --no-allow-insecure-repositories
        rm -rf rootdir/var/lib/apt/lists
-       testsuccess aptget update --allow-insecure-repositories
+       testwarning aptget update --allow-insecure-repositories
 }
 
 msgmsg 'Test without trusted option and good sources'
@@ -103,7 +109,7 @@ everythingsucceeds -t testing
 msgmsg 'Test with trusted=yes option and good and unsigned sources'
 cp -a rootdir/etc/apt/sources.list.d.bak/* rootdir/etc/apt/sources.list.d/
 sed -i 's#^deb\(-src\)\? #deb\1 [trusted=yes] #' rootdir/etc/apt/sources.list.d/*
-aptgetupdate
+aptgetupdate 'testwarning'
 everythingsucceeds
 everythingsucceeds -t stable
 everythingsucceeds -t testing
@@ -128,7 +134,7 @@ everythingsucceeds -t testing
 msgmsg 'Test with trusted=yes option and good and unknown sources'
 cp -a rootdir/etc/apt/sources.list.d.bak/* rootdir/etc/apt/sources.list.d/
 sed -i 's#^deb\(-src\)\? #deb\1 [trusted=yes] #' rootdir/etc/apt/sources.list.d/*
-aptgetupdate
+aptgetupdate 'testwarning'
 everythingsucceeds
 everythingsucceeds -t stable
 everythingsucceeds -t testing
@@ -154,7 +160,7 @@ everythingsucceeds -t testing
 msgmsg 'Test with trusted=yes option and good and expired sources'
 cp -a rootdir/etc/apt/sources.list.d.bak/* rootdir/etc/apt/sources.list.d/
 sed -i 's#^deb\(-src\)\? #deb\1 [trusted=yes] #' rootdir/etc/apt/sources.list.d/*
-aptgetupdate
+aptgetupdate 'testwarning'
 everythingsucceeds
 everythingsucceeds -t stable
 everythingsucceeds -t testing
@@ -181,7 +187,7 @@ everythingfails -t testing
 msgmsg 'Test with trusted=yes option and unsigned and good sources'
 cp -a rootdir/etc/apt/sources.list.d.bak/* rootdir/etc/apt/sources.list.d/
 sed -i 's#^deb\(-src\)\? #deb\1 [trusted=yes] #' rootdir/etc/apt/sources.list.d/*
-aptgetupdate
+aptgetupdate 'testwarning'
 everythingsucceeds
 everythingsucceeds -t stable
 everythingsucceeds -t testing
@@ -193,3 +199,20 @@ insecureaptgetupdate
 everythingfails
 everythingfails -t stable
 everythingfails -t testing
+
+msgmsg 'Test conflicting trusted options are refused'
+testsource() {
+       echo "$@" > rootdir/etc/apt/sources.list.d/example.list
+       testfailuremsg 'E: Conflicting values set for option Trusted concerning source http://example.org/bad/ unstable
+E: The list of sources could not be read.' aptget update --print-uris
+}
+for VAL in 'yes' 'no'; do
+       testsource "deb http://example.org/bad unstable main
+deb [trusted=${VAL}] http://example.org/bad unstable non-free"
+       testsource "deb [trusted=${VAL}] http://example.org/bad unstable main
+deb http://example.org/bad unstable non-free"
+done
+testsource 'deb [trusted=yes] http://example.org/bad unstable main
+deb [trusted=no] http://example.org/bad unstable non-free'
+testsource 'deb [trusted=no] http://example.org/bad unstable main
+deb [trusted=yes] http://example.org/bad unstable non-free'