From 92aacd885093389b5e9f7685ffe08219674ed6ff Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Wed, 17 Aug 2011 12:13:38 +0200 Subject: move the networkless test to the interactive helpers as it needs root rights for operation (ifup/down, iptables) so it is better run under supervision --- .../networkless-install-fixes/README | 5 +++++ .../networkless-install-fixes/sources.test.list | 25 ++++++++++++++++++++++ .../networkless-install-fixes/test.sh | 25 ++++++++++++++++++++++ test/networkless-install-fixes/README | 5 ----- test/networkless-install-fixes/sources.test.list | 25 ---------------------- test/networkless-install-fixes/test.sh | 25 ---------------------- 6 files changed, 55 insertions(+), 55 deletions(-) create mode 100644 test/interactive-helper/networkless-install-fixes/README create mode 100644 test/interactive-helper/networkless-install-fixes/sources.test.list create mode 100755 test/interactive-helper/networkless-install-fixes/test.sh delete mode 100644 test/networkless-install-fixes/README delete mode 100644 test/networkless-install-fixes/sources.test.list delete mode 100755 test/networkless-install-fixes/test.sh diff --git a/test/interactive-helper/networkless-install-fixes/README b/test/interactive-helper/networkless-install-fixes/README new file mode 100644 index 000000000..e7ee2b03d --- /dev/null +++ b/test/interactive-helper/networkless-install-fixes/README @@ -0,0 +1,5 @@ + +Those tests aim at making the networkless install timeout +quicker, see +https://wiki.ubuntu.com/NetworklessInstallationFixes +for details diff --git a/test/interactive-helper/networkless-install-fixes/sources.test.list b/test/interactive-helper/networkless-install-fixes/sources.test.list new file mode 100644 index 000000000..380e1804d --- /dev/null +++ b/test/interactive-helper/networkless-install-fixes/sources.test.list @@ -0,0 +1,25 @@ + +# archive.ubuntu.com +deb http://archive.ubuntu.com/ubuntu/ hardy main restricted +deb-src http://archive.ubuntu.com/ubuntu/ hardy main restricted + +deb http://archive.ubuntu.com/ubuntu/ hardy-updates main restricted +deb-src http://archive.ubuntu.com/ubuntu/ hardy-updates main restricted + +deb http://archive.ubuntu.com/ubuntu/ hardy universe +deb-src http://archive.ubuntu.com/ubuntu/ hardy universe + +deb http://archive.ubuntu.com/ubuntu/ hardy-updates universe +deb-src http://archive.ubuntu.com/ubuntu/ hardy-updates universe + +# security.ubuntu.com +deb http://security.ubuntu.com/ubuntu/ hardy-security main restricted +deb-src http://security.ubuntu.com/ubuntu/ hardy-security main restricted + +deb http://security.ubuntu.com/ubuntu/ hardy-security universe +deb-src http://security.ubuntu.com/ubuntu/ hardy-security universe + + +# archive.canonical.com +deb http://archive.canonical.com/ubuntu/ hardy-partner universe +deb-src http://archive.canonical.com/ubuntu/ hardy-partner universe diff --git a/test/interactive-helper/networkless-install-fixes/test.sh b/test/interactive-helper/networkless-install-fixes/test.sh new file mode 100755 index 000000000..809d467ba --- /dev/null +++ b/test/interactive-helper/networkless-install-fixes/test.sh @@ -0,0 +1,25 @@ +#!/bin/sh + +OPTS="-o Dir::Etc::sourcelist=./sources.test.list -o Acquire::http::timeout=20" + +# setup +unset http_proxy +iptables --flush + +echo "No network at all" +ifdown eth0 +time apt-get update $OPTS 2>&1 |grep system +ifup eth0 +echo "" + +echo "no working DNS (port 53 DROP)" +iptables -A OUTPUT -p udp --dport 53 -j DROP +time apt-get update $OPTS 2>&1 |grep system +iptables --flush +echo "" + +echo "DNS but no access to archive.ubuntu.com (port 80 DROP)" +iptables -A OUTPUT -p tcp --dport 80 -j DROP +time apt-get update $OPTS 2>&1 |grep system +iptables --flush +echo "" diff --git a/test/networkless-install-fixes/README b/test/networkless-install-fixes/README deleted file mode 100644 index e7ee2b03d..000000000 --- a/test/networkless-install-fixes/README +++ /dev/null @@ -1,5 +0,0 @@ - -Those tests aim at making the networkless install timeout -quicker, see -https://wiki.ubuntu.com/NetworklessInstallationFixes -for details diff --git a/test/networkless-install-fixes/sources.test.list b/test/networkless-install-fixes/sources.test.list deleted file mode 100644 index 380e1804d..000000000 --- a/test/networkless-install-fixes/sources.test.list +++ /dev/null @@ -1,25 +0,0 @@ - -# archive.ubuntu.com -deb http://archive.ubuntu.com/ubuntu/ hardy main restricted -deb-src http://archive.ubuntu.com/ubuntu/ hardy main restricted - -deb http://archive.ubuntu.com/ubuntu/ hardy-updates main restricted -deb-src http://archive.ubuntu.com/ubuntu/ hardy-updates main restricted - -deb http://archive.ubuntu.com/ubuntu/ hardy universe -deb-src http://archive.ubuntu.com/ubuntu/ hardy universe - -deb http://archive.ubuntu.com/ubuntu/ hardy-updates universe -deb-src http://archive.ubuntu.com/ubuntu/ hardy-updates universe - -# security.ubuntu.com -deb http://security.ubuntu.com/ubuntu/ hardy-security main restricted -deb-src http://security.ubuntu.com/ubuntu/ hardy-security main restricted - -deb http://security.ubuntu.com/ubuntu/ hardy-security universe -deb-src http://security.ubuntu.com/ubuntu/ hardy-security universe - - -# archive.canonical.com -deb http://archive.canonical.com/ubuntu/ hardy-partner universe -deb-src http://archive.canonical.com/ubuntu/ hardy-partner universe diff --git a/test/networkless-install-fixes/test.sh b/test/networkless-install-fixes/test.sh deleted file mode 100755 index 809d467ba..000000000 --- a/test/networkless-install-fixes/test.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/sh - -OPTS="-o Dir::Etc::sourcelist=./sources.test.list -o Acquire::http::timeout=20" - -# setup -unset http_proxy -iptables --flush - -echo "No network at all" -ifdown eth0 -time apt-get update $OPTS 2>&1 |grep system -ifup eth0 -echo "" - -echo "no working DNS (port 53 DROP)" -iptables -A OUTPUT -p udp --dport 53 -j DROP -time apt-get update $OPTS 2>&1 |grep system -iptables --flush -echo "" - -echo "DNS but no access to archive.ubuntu.com (port 80 DROP)" -iptables -A OUTPUT -p tcp --dport 80 -j DROP -time apt-get update $OPTS 2>&1 |grep system -iptables --flush -echo "" -- cgit v1.2.3