summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--test/integration/framework9
-rwxr-xr-xtest/integration/test-ubuntu-bug3463862
-rw-r--r--test/interactive-helper/aptwebserver.cc2
3 files changed, 5 insertions, 8 deletions
diff --git a/test/integration/framework b/test/integration/framework
index bf46ae0c5..8f37d4a03 100644
--- a/test/integration/framework
+++ b/test/integration/framework
@@ -687,14 +687,11 @@ signreleasefiles() {
msgdone "info"
}
-simulatebrokenwebserver() {
- if ! test -x ${BUILDDIRECTORY}/aptwebserver; then
- msgdie 'Need the aptwebserver to simulate broken connections'
+changetowebserver() {
+ if [ -n "$1" ] && ! test -x ${BUILDDIRECTORY}/aptwebserver; then
+ msgdie 'Need the aptwebserver when passing arguments'
fi
- changetowebserver '--simulate-paywall'
-}
-changetowebserver() {
if test -x ${BUILDDIRECTORY}/aptwebserver; then
cd aptarchive
LD_LIBRARY_PATH=${BUILDDIRECTORY} ${BUILDDIRECTORY}/aptwebserver $@ 2> /dev/null > /dev/null &
diff --git a/test/integration/test-ubuntu-bug346386 b/test/integration/test-ubuntu-bug346386
index 57004f343..a5f502853 100755
--- a/test/integration/test-ubuntu-bug346386
+++ b/test/integration/test-ubuntu-bug346386
@@ -10,7 +10,7 @@ configarchitecture 'amd64'
buildsimplenativepackage 'apt' 'all' '1.0' 'stable'
setupaptarchive
-simulatebrokenwebserver
+changetowebserver --simulate-paywall
rm -rf rootdir/var/lib/apt/lists
aptget update
diff --git a/test/interactive-helper/aptwebserver.cc b/test/interactive-helper/aptwebserver.cc
index ebe04d2a3..8fbb9eab9 100644
--- a/test/interactive-helper/aptwebserver.cc
+++ b/test/interactive-helper/aptwebserver.cc
@@ -154,7 +154,7 @@ int main(int argc, const char *argv[])
};
CommandLine CmdL(Args, _config);
- if(pkgInitConfig(*_config) == false || CmdL.Parse(argc,argv) == false) {
+ if(CmdL.Parse(argc,argv) == false) {
_error->DumpErrors();
exit(1);
}