diff options
| author | David Kalnischkies <david@kalnischkies.de> | 2017-06-28 12:57:51 +0200 |
|---|---|---|
| committer | David Kalnischkies <david@kalnischkies.de> | 2017-06-28 19:17:57 +0200 |
| commit | cbaf353ead58aa9eefe51542b6ad91e69b6289ce (patch) | |
| tree | 2487111d77a0d0c8fac42e6d87f5fa309cacd455 /test | |
| parent | 11c3624ce3575076ca52350f66d4bd2e63db5d73 (diff) | |
fail instead of warn on insecure repositories in apt-get
The exception was made to give (script) users a one-release grace period
to adapt their setup to deal with apt enforcing signing of repositories.
As we are now at the start of a new release cycle its as good a time as
any to lift it now.
Removes-Exception: 952ee63b0af14a534c0aca00c11d1a99be6b22b2
Diffstat (limited to 'test')
3 files changed, 9 insertions, 5 deletions
diff --git a/test/integration/test-apt-get-update-unauth-warning b/test/integration/test-apt-get-update-unauth-warning index 093478b9e..616e0234c 100755 --- a/test/integration/test-apt-get-update-unauth-warning +++ b/test/integration/test-apt-get-update-unauth-warning @@ -21,7 +21,8 @@ setupaptarchive --no-update APTARCHIVE="$(readlink -f ./aptarchive)" find "$APTARCHIVE/dists/unstable" \( -name 'InRelease' -o -name 'Release.gpg' \) -delete sed -i -n '/^SHA1:$/q;p' "${APTARCHIVE}/dists/unstable/Release" -testwarning aptget update +testfailure aptget update +testwarning aptget update --allow-insecure-repositories rm -rf rootdir/var/lib/apt/lists @@ -35,7 +36,7 @@ Err:2 file:$APTARCHIVE unstable Release Reading package lists... E: The repository 'file:$APTARCHIVE unstable Release' does not have a Release file. N: Updating from such a repository can't be done securely, and is therefore disabled by default. -N: See apt-secure(8) manpage for repository creation and user configuration details." aptget update --no-allow-insecure-repositories +N: See apt-secure(8) manpage for repository creation and user configuration details." aptget update # no package foo testsuccessequal 'Listing...' apt list foo diff --git a/test/integration/test-bug-838779-untrusted-to-trusted-Release-hit b/test/integration/test-bug-838779-untrusted-to-trusted-Release-hit index 6fcc2b8e1..50234753b 100755 --- a/test/integration/test-bug-838779-untrusted-to-trusted-Release-hit +++ b/test/integration/test-bug-838779-untrusted-to-trusted-Release-hit @@ -23,7 +23,8 @@ testdpkgnotinstalled 'foo' msgmsg 'Untrusted to trusted hit' 'InRelease' rm -rf rootdir/var/lib/apt/lists rootdir/var/cache/apt/archives mv rootdir/etc/apt/trusted.gpg.d rootdir/etc/apt/trusted.gpg.d-bak -testwarning aptget update +testfailure aptget update +testwarning aptget update --allow-insecure-repositories testfailure apt install foo -y testdpkgnotinstalled 'foo' mv rootdir/etc/apt/trusted.gpg.d-bak rootdir/etc/apt/trusted.gpg.d @@ -37,7 +38,8 @@ msgmsg 'Untrusted to trusted hit' 'Release.gpg' find aptarchive -name 'InRelease' -delete rm -rf rootdir/var/lib/apt/lists rootdir/var/cache/apt/archives mv rootdir/etc/apt/trusted.gpg.d rootdir/etc/apt/trusted.gpg.d-bak -testwarning aptget update +testfailure aptget update +testwarning aptget update --allow-insecure-repositories testfailure apt install foo -y testdpkgnotinstalled 'foo' mv rootdir/etc/apt/trusted.gpg.d-bak rootdir/etc/apt/trusted.gpg.d diff --git a/test/integration/test-handle-redirect-as-used-mirror-change b/test/integration/test-handle-redirect-as-used-mirror-change index 254bdd54a..a6f8b788f 100755 --- a/test/integration/test-handle-redirect-as-used-mirror-change +++ b/test/integration/test-handle-redirect-as-used-mirror-change @@ -89,5 +89,6 @@ Reading package lists..." aptget update rm -rf rootdir/var/lib/apt/lists find aptarchive -name 'Release.gpg' -delete find aptarchive -name 'Release' -delete -testwarning aptget update +testfailure aptget update +testwarning aptget update --allow-insecure-repositories testsuccess grep 'does not have a Release file' rootdir/tmp/testwarning.output |