add failing regression test for bug #346386

diff --git a/test/integration/framework b/test/integration/framework
index a514bef20e0f1b9cf26796a414af006e695605df..bf46ae0c56eb397d0c68bc0195bf735c7a0b94dd 100644 (file)
--- a/test/integration/framework
+++ b/test/integration/framework
@@ -687,10 +687,17 @@ signreleasefiles() {
        msgdone "info"
 }
 
        msgdone "info"
 }
 

+simulatebrokenwebserver() {
+       if ! test -x ${BUILDDIRECTORY}/aptwebserver; then
+                 msgdie 'Need the aptwebserver to simulate broken connections'
+        fi
+        changetowebserver '--simulate-paywall'
+}
+

 changetowebserver() {
        if test -x ${BUILDDIRECTORY}/aptwebserver; then
                cd aptarchive
 changetowebserver() {
        if test -x ${BUILDDIRECTORY}/aptwebserver; then
                cd aptarchive

-               LD_LIBRARY_PATH=${BUILDDIRECTORY} ${BUILDDIRECTORY}/aptwebserver 2> /dev/null > /dev/null &
+               LD_LIBRARY_PATH=${BUILDDIRECTORY} ${BUILDDIRECTORY}/aptwebserver $@ 2> /dev/null > /dev/null &

                addtrap "kill $!;"
                cd - > /dev/null
        elif which weborf > /dev/null; then
                addtrap "kill $!;"
                cd - > /dev/null
        elif which weborf > /dev/null; then

diff --git a/test/integration/test-ubuntu-bug346386 b/test/integration/test-ubuntu-bug346386
new file mode 100755 (executable)
index 0000000..57004f3
--- /dev/null
+++ b/test/integration/test-ubuntu-bug346386
@@ -0,0 +1,19 @@
+#!/bin/sh
+set -e
+
+TESTDIR=$(readlink -f $(dirname $0))
+. $TESTDIR/framework
+
+setupenvironment
+configarchitecture 'amd64'
+
+buildsimplenativepackage 'apt' 'all' '1.0' 'stable'
+
+setupaptarchive
+simulatebrokenwebserver
+
+rm -rf rootdir/var/lib/apt/lists
+aptget update 
+testequal 'partial' "$(ls rootdir/var/lib/apt/lists/)"
+
+

diff --git a/test/interactive-helper/aptwebserver.cc b/test/interactive-helper/aptwebserver.cc
index 3c476ad056905da92f127dbf5b4e76ca4978d059..c7b815925914eb22a503bcb245a2b30210b6e329 100644 (file)
--- a/test/interactive-helper/aptwebserver.cc
+++ b/test/interactive-helper/aptwebserver.cc
@@ -244,11 +244,11 @@ int main(int argc, const char *argv[])
         }
         _error->DumpErrors(std::cerr);
         messages.clear();
         }
         _error->DumpErrors(std::cerr);
         messages.clear();

-      }

 
 

-      std::clog << "CLOSE client " << client 
-                << " on socket " << sock << std::endl;
-      close(client);
+         std::clog << "CLOSE client " << client 
+                   << " on socket " << sock << std::endl;
+         close(client);
+      }

    }
    return 0;
 }
    }
    return 0;
 }