cleanup, thanks to donkult for his feedback

diff --git a/test/integration/framework b/test/integration/framework
index bf46ae0c56eb397d0c68bc0195bf735c7a0b94dd..8f37d4a0337bd3c36989ab6a682f35640016a533 100644 (file)
--- a/test/integration/framework
+++ b/test/integration/framework
@@ -687,14 +687,11 @@ signreleasefiles() {
        msgdone "info"
 }
 
        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
         fi

-        changetowebserver '--simulate-paywall'
-}

 
 

-changetowebserver() {

        if test -x ${BUILDDIRECTORY}/aptwebserver; then
                cd aptarchive
                LD_LIBRARY_PATH=${BUILDDIRECTORY} ${BUILDDIRECTORY}/aptwebserver $@ 2> /dev/null > /dev/null &
        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 57004f343f169b8da21db378612513c13e16fa90..a5f50285338aa18da77f28b8a39e0fe3a1c1e172 100755 (executable)
--- 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
 buildsimplenativepackage 'apt' 'all' '1.0' 'stable'
 
 setupaptarchive

-simulatebrokenwebserver
+changetowebserver --simulate-paywall

 
 rm -rf rootdir/var/lib/apt/lists
 aptget update 
 
 rm -rf rootdir/var/lib/apt/lists
 aptget update 

diff --git a/test/interactive-helper/aptwebserver.cc b/test/interactive-helper/aptwebserver.cc
index ebe04d2a35ccdec847b96fc851d33335f2cf26a2..8fbb9eab9791c0f32959239fe354905405993ec7 100644 (file)
--- 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);
    };
 
    CommandLine CmdL(Args, _config);

-   if(pkgInitConfig(*_config) == false || CmdL.Parse(argc,argv) == false) {
+   if(CmdL.Parse(argc,argv) == false) {

       _error->DumpErrors();
       exit(1);
    }
       _error->DumpErrors();
       exit(1);
    }