summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorMichael Vogt <mvo@ubuntu.com>2014-10-14 17:00:56 +0200
committerMichael Vogt <mvo@ubuntu.com>2014-10-14 17:00:56 +0200
commitd4f4bcf76bb2035b7df370a82b081384140b3083 (patch)
tree09dae7a47b31de9eeaae525e89b456e02ea8d44f /test
parenta4221092e50af0b74040f5b4ee800c78b05fd84e (diff)
Add new configallowinsecurerepositories to the test framework
Add a new configallowinsecurerepositories that controls the value of Acquire::AllowInsecureRepositories for the tests. Set it to "false" for most of the testsuite and only enable it where its really needed. We want to switch the default for this post-jessie.
Diffstat (limited to 'test')
-rw-r--r--test/integration/framework9
-rwxr-xr-xtest/integration/test-apt-update-ims2
2 files changed, 11 insertions, 0 deletions
diff --git a/test/integration/framework b/test/integration/framework
index 160df9301..96b867788 100644
--- a/test/integration/framework
+++ b/test/integration/framework
@@ -243,6 +243,10 @@ setupenvironment() {
echo "Apt::Cmd::Disable-Script-Warning \"1\";" > rootdir/etc/apt/apt.conf.d/apt-binary
configcompression '.' 'gz' #'bz2' 'lzma' 'xz'
+ # Acquire::AllowInsecureRepositories=false is not yet the default
+ # but we want it to be the default soon
+ configallowinsecurerepositories "false";
+
# cleanup the environment a bit
# prefer our apt binaries over the system apt binaries
export PATH="${BUILDDIRECTORY}:${PATH}:/usr/local/sbin:/usr/sbin:/sbin"
@@ -317,6 +321,11 @@ configdpkg() {
fi
}
+configallowinsecurerepositories() {
+ echo "Acquire::AllowInsecureRepositories \"$1\";" > rootdir/etc/apt/apt.conf.d/allow-insecure-repositories.conf
+
+}
+
configcompression() {
while [ -n "$1" ]; do
case "$1" in
diff --git a/test/integration/test-apt-update-ims b/test/integration/test-apt-update-ims
index 06b9c2b62..c74058c5d 100755
--- a/test/integration/test-apt-update-ims
+++ b/test/integration/test-apt-update-ims
@@ -64,6 +64,8 @@ runtest
# no Release.gpg or InRelease
+configallowinsecurerepositories "true"
+
msgmsg "Release only"
EXPECT="Ign http://localhost:8080 unstable InRelease
404 Not Found