From e6cd40dc17722bbe6c9d734c3a58b39a18c34174 Mon Sep 17 00:00:00 2001
From: David Kalnischkies <kalnischkies@gmail.com>
Date: Mon, 9 Jul 2012 17:38:40 +0200
Subject: start implementing an extremely simple webserver for testing APT

---
 test/integration/framework              |   7 +-
 test/integration/skip-aptwebserver      |  25 ++++
 test/interactive-helper/aptwebserver.cc | 216 ++++++++++++++++++++++++++++++++
 test/interactive-helper/makefile        |   7 ++
 4 files changed, 254 insertions(+), 1 deletion(-)
 create mode 100755 test/integration/skip-aptwebserver
 create mode 100644 test/interactive-helper/aptwebserver.cc

(limited to 'test')

diff --git a/test/integration/framework b/test/integration/framework
index 2d6ada117..a514bef20 100644
--- a/test/integration/framework
+++ b/test/integration/framework
@@ -688,7 +688,12 @@ signreleasefiles() {
 }
 
 changetowebserver() {
-	if which weborf > /dev/null; then
+	if test -x ${BUILDDIRECTORY}/aptwebserver; then
+		cd aptarchive
+		LD_LIBRARY_PATH=${BUILDDIRECTORY} ${BUILDDIRECTORY}/aptwebserver 2> /dev/null > /dev/null &
+		addtrap "kill $!;"
+		cd - > /dev/null
+	elif which weborf > /dev/null; then
 		weborf -xb aptarchive/ 2>&1 > /dev/null &
 		addtrap "kill $!;"
 	elif which gatling > /dev/null; then
diff --git a/test/integration/skip-aptwebserver b/test/integration/skip-aptwebserver
new file mode 100755
index 000000000..0622941ce
--- /dev/null
+++ b/test/integration/skip-aptwebserver
@@ -0,0 +1,25 @@
+#!/bin/sh
+set -e
+
+TESTDIR=$(readlink -f $(dirname $0))
+. $TESTDIR/framework
+
+setupenvironment
+configarchitecture 'amd64'
+
+buildsimplenativepackage 'apt' 'all' '1.0' 'stable'
+
+setupaptarchive
+changetowebserver
+
+rm -rf rootdir/var/lib/apt/lists
+aptget update -qq
+testequal 'Hit http://localhost stable InRelease
+Hit http://localhost stable/main Sources
+Hit http://localhost stable/main amd64 Packages
+Hit http://localhost stable/main Translation-en
+Reading package lists...' aptget update
+
+mv rootdir/var/lib/apt/lists/localhost* rootdir/var/lib/apt/lists/partial
+aptget update
+
diff --git a/test/interactive-helper/aptwebserver.cc b/test/interactive-helper/aptwebserver.cc
new file mode 100644
index 000000000..7a3624b6e
--- /dev/null
+++ b/test/interactive-helper/aptwebserver.cc
@@ -0,0 +1,216 @@
+#include <apt-pkg/strutl.h>
+#include <apt-pkg/fileutl.h>
+#include <apt-pkg/error.h>
+#include <apt-pkg/cmndline.h>
+
+#include <vector>
+#include <string>
+#include <list>
+#include <sstream>
+
+#include <sys/socket.h>
+#include <sys/types.h>
+#include <netinet/in.h>
+#include <unistd.h>
+#include <errno.h>
+#include <time.h>
+#include <stdlib.h>
+
+char const * const httpcodeToStr(int httpcode) { /*{{{*/
+   switch (httpcode) {
+      // Informational 1xx
+      case 100: return "100 Continue";
+      case 101: return "101 Switching Protocols";
+      // Successful 2xx
+      case 200: return "200 OK";
+      case 201: return "201 Created";
+      case 202: return "202 Accepted";
+      case 203: return "203 Non-Authoritative Information";
+      case 204: return "204 No Content";
+      case 205: return "205 Reset Content";
+      case 206: return "206 Partial Conent";
+      // Redirections 3xx
+      case 300: return "300 Multiple Choices";
+      case 301: return "301 Moved Permanently";
+      case 302: return "302 Found";
+      case 303: return "303 See Other";
+      case 304: return "304 Not Modified";
+      case 305: return "304 Use Proxy";
+      case 307: return "307 Temporary Redirect";
+      // Client errors 4xx
+      case 400: return "400 Bad Request";
+      case 401: return "401 Unauthorized";
+      case 402: return "402 Payment Required";
+      case 403: return "403 Forbidden";
+      case 404: return "404 Not Found";
+      case 405: return "405 Method Not Allowed";
+      case 406: return "406 Not Acceptable";
+      case 407: return "Proxy Authentication Required";
+      case 408: return "Request Time-out";
+      case 409: return "Conflict";
+      case 410: return "Gone";
+      case 411: return "Length Required";
+      case 412: return "Precondition Failed";
+      case 413: return "Request Entity Too Large";
+      case 414: return "Request-URI Too Large";
+      case 415: return "Unsupported Media Type";
+      case 416: return "Requested range not satisfiable";
+      case 417: return "Expectation Failed";
+      // Server error 5xx
+      case 500: return "Internal Server Error";
+      case 501: return "Not Implemented";
+      case 502: return "Bad Gateway";
+      case 503: return "Service Unavailable";
+      case 504: return "Gateway Time-out";
+      case 505: return "HTTP Version not supported";
+   }
+   return NULL;
+} /*}}}*/
+void addFileHeaders(std::list<std::string> &headers, FileFd &data) { /*{{{*/
+   std::ostringstream contentlength;
+   contentlength << "Content-Length: " << data.FileSize();
+   headers.push_back(contentlength.str());
+
+   std::string lastmodified("Last-Modified: ");
+   lastmodified.append(TimeRFC1123(data.ModificationTime()));
+   headers.push_back(lastmodified);
+} /*}}}*/
+bool sendHead(int client, int httpcode, std::list<std::string> &headers) { /*{{{*/
+   string response("HTTP/1.1 ");
+   response.append(httpcodeToStr(httpcode));
+   headers.push_front(response);
+
+   headers.push_back("Server: APT webserver");
+
+   std::string date("Date: ");
+   date.append(TimeRFC1123(time(NULL)));
+   headers.push_back(date);
+
+   std::clog << ">>> RESPONSE >>>" << std::endl;
+   bool Success = true;
+   for (std::list<std::string>::const_iterator h = headers.begin();
+	Success == true && h != headers.end(); ++h) {
+      Success &= FileFd::Write(client, h->c_str(), h->size());
+      Success &= FileFd::Write(client, "\r\n", 2);
+      std::clog << *h << std::endl;
+   }
+   Success &= FileFd::Write(client, "\r\n", 2);
+   std::clog << "<<<<<<<<<<<<<<<<" << std::endl;
+   return Success;
+} /*}}}*/
+bool sendFile(int client, FileFd &data) { /*{{{*/
+   bool Success = true;
+   char buffer[500];
+   unsigned long long actual = 0;
+   while ((Success &= data.Read(buffer, sizeof(buffer), &actual)) == true) {
+      if (actual == 0)
+	 break;
+      Success &= FileFd::Write(client, buffer, actual);
+   }
+   Success &= FileFd::Write(client, "\r\n", 2);
+   return Success;
+} /*}}}*/
+bool sendData(int client, std::string &data) { /*{{{*/
+   bool Success = true;
+   Success &= FileFd::Write(client, data.c_str(), data.size());
+   Success &= FileFd::Write(client, "\r\n", 2);
+   return Success;
+} /*}}}*/
+void sendError(int client, int httpcode, string request, bool content) { /*{{{*/
+   std::list<std::string> headers;
+   sendHead(client, httpcode, headers);
+   if (content == false)
+      return;
+   string response("<html><head><title>");
+   response.append(httpcodeToStr(httpcode)).append("</title></head>");
+   response.append("<body><h1>").append(httpcodeToStr(httpcode)).append("</h1");
+   response.append("This error is a result of the request: <pre>");
+   response.append(request).append("</pre></body></html>");
+   sendData(client, response);
+} /*}}}*/
+
+int main(int argc, const char *argv[])
+{
+   // create socket, bind and listen to it {{{
+   int sock = socket(AF_INET6, SOCK_STREAM, 0);
+   if(sock < 0 ) {
+      _error->Errno("aptwerbserver", "Couldn't create socket");
+      _error->DumpErrors(std::cerr);
+      return 1;
+   }
+
+   // ensure that we accept all connections: v4 or v6
+   int const iponly = 0;
+   setsockopt(sock, IPPROTO_IPV6, IPV6_V6ONLY, &iponly, sizeof(iponly));
+   // to not linger to an address
+   int const enable = 1;
+   setsockopt(sock, SOL_SOCKET, SO_REUSEADDR, &enable, sizeof(enable));
+
+   struct sockaddr_in6 locAddr;
+   memset(&locAddr, 0, sizeof(locAddr));
+   locAddr.sin6_family = AF_INET6;
+   locAddr.sin6_port = htons(8080);
+   locAddr.sin6_addr = in6addr_any;
+
+   if (bind(sock, (struct sockaddr*) &locAddr, sizeof(locAddr)) < 0) {
+      _error->Errno("aptwerbserver", "Couldn't bind");
+      _error->DumpErrors(std::cerr);
+      return 2;
+   }
+
+   listen(sock, 1);
+   /*}}}*/
+
+   std::vector<std::string> messages;
+   int client;
+   while ((client = accept(sock, NULL, NULL)) != -1) {
+      std::clog << "ACCEPT client " << client << " on socket " << sock << std::endl;
+
+      while (ReadMessages(client, messages)) {
+	 for (std::vector<std::string>::const_iterator m = messages.begin();
+	      m != messages.end(); ++m) {
+	    std::clog << ">>> REQUEST >>>>" << std::endl << *m << std::endl << "<<<<<<<<<<<<<<<<" << std::endl;
+	    std::list<std::string> headers;
+	    bool sendContent = true;
+	    if (strncmp(m->c_str(), "HEAD ", 5) == 0)
+	       sendContent = false;
+	    if (strncmp(m->c_str(), "GET ", 4) != 0)
+	       sendError(client, 501, *m, true);
+
+	    std::string host = LookupTag(*m, "Host", "");
+	    if (host.empty() == true) {
+	       // RFC 2616 §14.23 Host
+	       sendError(client, 400, *m, sendContent);
+	       continue;
+	    }
+
+	    size_t const filestart = m->find(' ', 5);
+	    string filename = m->substr(5, filestart - 5);
+
+	    if (RealFileExists(filename) == false)
+	       sendError(client, 404, *m, sendContent);
+	    else {
+	       FileFd data(filename, FileFd::ReadOnly);
+	       std::string condition = LookupTag(*m, "If-Modified-Since", "");
+	       if (condition.empty() == false) {
+		  time_t cache;
+		  if (RFC1123StrToTime(condition.c_str(), cache) == true && cache >= data.ModificationTime()) {
+		     sendError(client, 304, *m, false);
+		     continue;
+		  }
+	       }
+	       addFileHeaders(headers, data);
+	       sendHead(client, 200, headers);
+	       if (sendContent == true)
+		  sendFile(client, data);
+	    }
+	 }
+	 _error->DumpErrors(std::cerr);
+	 messages.clear();
+      }
+
+      std::clog << "CLOSE client " << client << " on socket " << sock << std::endl;
+      close(client);
+   }
+   return 0;
+}
diff --git a/test/interactive-helper/makefile b/test/interactive-helper/makefile
index 10d1e44ec..fee94cd77 100644
--- a/test/interactive-helper/makefile
+++ b/test/interactive-helper/makefile
@@ -37,3 +37,10 @@ include $(PROGRAM_H)
 #SLIBS = -lapt-pkg -lrpm
 #SOURCE = rpmver.cc
 #include $(PROGRAM_H)
+
+# very simple webserver for APT testing
+PROGRAM=aptwebserver
+SLIBS = -lapt-pkg
+LIB_MAKES = apt-pkg/makefile
+SOURCE = aptwebserver.cc
+include $(PROGRAM_H)
-- 
cgit v1.2.3


From 90d1d54ef2a68bd443815f26e9e2b578a1d7c419 Mon Sep 17 00:00:00 2001
From: Michael Vogt <michael.vogt@ubuntu.com>
Date: Tue, 10 Jul 2012 11:35:56 +0200
Subject: add commandline, add configurable port, add --simulate-paywall to
 simulate a broken webserver that intercepts connections and returns nonsese

---
 test/interactive-helper/aptwebserver.cc | 52 ++++++++++++++++++++++++++++-----
 1 file changed, 45 insertions(+), 7 deletions(-)

(limited to 'test')

diff --git a/test/interactive-helper/aptwebserver.cc b/test/interactive-helper/aptwebserver.cc
index 7a3624b6e..3c476ad05 100644
--- a/test/interactive-helper/aptwebserver.cc
+++ b/test/interactive-helper/aptwebserver.cc
@@ -2,6 +2,8 @@
 #include <apt-pkg/fileutl.h>
 #include <apt-pkg/error.h>
 #include <apt-pkg/cmndline.h>
+#include <apt-pkg/configuration.h>
+#include <apt-pkg/init.h>
 
 #include <vector>
 #include <string>
@@ -66,6 +68,7 @@ char const * const httpcodeToStr(int httpcode) { /*{{{*/
    }
    return NULL;
 } /*}}}*/
+
 void addFileHeaders(std::list<std::string> &headers, FileFd &data) { /*{{{*/
    std::ostringstream contentlength;
    contentlength << "Content-Length: " << data.FileSize();
@@ -98,6 +101,7 @@ bool sendHead(int client, int httpcode, std::list<std::string> &headers) { /*{{{
    std::clog << "<<<<<<<<<<<<<<<<" << std::endl;
    return Success;
 } /*}}}*/
+
 bool sendFile(int client, FileFd &data) { /*{{{*/
    bool Success = true;
    char buffer[500];
@@ -110,12 +114,14 @@ bool sendFile(int client, FileFd &data) { /*{{{*/
    Success &= FileFd::Write(client, "\r\n", 2);
    return Success;
 } /*}}}*/
+
 bool sendData(int client, std::string &data) { /*{{{*/
    bool Success = true;
    Success &= FileFd::Write(client, data.c_str(), data.size());
    Success &= FileFd::Write(client, "\r\n", 2);
    return Success;
 } /*}}}*/
+
 void sendError(int client, int httpcode, string request, bool content) { /*{{{*/
    std::list<std::string> headers;
    sendHead(client, httpcode, headers);
@@ -131,6 +137,19 @@ void sendError(int client, int httpcode, string request, bool content) { /*{{{*/
 
 int main(int argc, const char *argv[])
 {
+   CommandLine::Args Args[] = {
+      {0, "simulate-paywall", "aptwebserver::Simulate-Paywall", 
+       CommandLine::Boolean},
+      {0, "port", "aptwebserver::port", CommandLine::HasArg},
+      {0,0,0,0}
+   };
+
+   CommandLine CmdL(Args, _config);
+   if(pkgInitConfig(*_config) == false || CmdL.Parse(argc,argv) == false) {
+      _error->DumpErrors();
+      exit(1);
+   }
+
    // create socket, bind and listen to it {{{
    int sock = socket(AF_INET6, SOCK_STREAM, 0);
    if(sock < 0 ) {
@@ -139,6 +158,10 @@ int main(int argc, const char *argv[])
       return 1;
    }
 
+   // get the port
+   int const port = _config->FindI("aptwebserver::port", 8080);
+   bool const simulate_broken_server = _config->FindB("aptwebserver::Simulate-Paywall", false);
+
    // ensure that we accept all connections: v4 or v6
    int const iponly = 0;
    setsockopt(sock, IPPROTO_IPV6, IPV6_V6ONLY, &iponly, sizeof(iponly));
@@ -149,7 +172,7 @@ int main(int argc, const char *argv[])
    struct sockaddr_in6 locAddr;
    memset(&locAddr, 0, sizeof(locAddr));
    locAddr.sin6_family = AF_INET6;
-   locAddr.sin6_port = htons(8080);
+   locAddr.sin6_port = htons(port);
    locAddr.sin6_addr = in6addr_any;
 
    if (bind(sock, (struct sockaddr*) &locAddr, sizeof(locAddr)) < 0) {
@@ -158,18 +181,26 @@ int main(int argc, const char *argv[])
       return 2;
    }
 
+   if (simulate_broken_server) {
+      std::clog << "Simulating a broken web server that return nonsense "
+                   "for all querries" << std::endl;
+   } else {
+      std::clog << "Serving ANY file on port: " << port << std::endl;
+   }
+
    listen(sock, 1);
-   /*}}}*/
 
    std::vector<std::string> messages;
    int client;
    while ((client = accept(sock, NULL, NULL)) != -1) {
-      std::clog << "ACCEPT client " << client << " on socket " << sock << std::endl;
+      std::clog << "ACCEPT client " << client
+                << " on socket " << sock << std::endl;
 
       while (ReadMessages(client, messages)) {
 	 for (std::vector<std::string>::const_iterator m = messages.begin();
 	      m != messages.end(); ++m) {
-	    std::clog << ">>> REQUEST >>>>" << std::endl << *m << std::endl << "<<<<<<<<<<<<<<<<" << std::endl;
+	    std::clog << ">>> REQUEST >>>>" << std::endl << *m 
+                      << std::endl << "<<<<<<<<<<<<<<<<" << std::endl;
 	    std::list<std::string> headers;
 	    bool sendContent = true;
 	    if (strncmp(m->c_str(), "HEAD ", 5) == 0)
@@ -187,14 +218,20 @@ int main(int argc, const char *argv[])
 	    size_t const filestart = m->find(' ', 5);
 	    string filename = m->substr(5, filestart - 5);
 
-	    if (RealFileExists(filename) == false)
+            if (simulate_broken_server == true) {
+               sendHead(client, 200, headers);
+               string data("ni ni ni");
+               sendData(client, data);
+            }
+	    else if (RealFileExists(filename) == false)
 	       sendError(client, 404, *m, sendContent);
 	    else {
 	       FileFd data(filename, FileFd::ReadOnly);
 	       std::string condition = LookupTag(*m, "If-Modified-Since", "");
 	       if (condition.empty() == false) {
 		  time_t cache;
-		  if (RFC1123StrToTime(condition.c_str(), cache) == true && cache >= data.ModificationTime()) {
+		  if (RFC1123StrToTime(condition.c_str(), cache) == true && 
+                      cache >= data.ModificationTime()) {
 		     sendError(client, 304, *m, false);
 		     continue;
 		  }
@@ -209,7 +246,8 @@ int main(int argc, const char *argv[])
 	 messages.clear();
       }
 
-      std::clog << "CLOSE client " << client << " on socket " << sock << std::endl;
+      std::clog << "CLOSE client " << client 
+                << " on socket " << sock << std::endl;
       close(client);
    }
    return 0;
-- 
cgit v1.2.3


From da3ebfe79d570c3aeb5f0a407cfec7996f44420c Mon Sep 17 00:00:00 2001
From: Michael Vogt <michael.vogt@ubuntu.com>
Date: Tue, 10 Jul 2012 12:01:46 +0200
Subject: add failing regression test for bug  #346386

---
 test/integration/framework              |  9 ++++++++-
 test/integration/test-ubuntu-bug346386  | 19 +++++++++++++++++++
 test/interactive-helper/aptwebserver.cc |  8 ++++----
 3 files changed, 31 insertions(+), 5 deletions(-)
 create mode 100755 test/integration/test-ubuntu-bug346386

(limited to 'test')

diff --git a/test/integration/framework b/test/integration/framework
index a514bef20..bf46ae0c5 100644
--- a/test/integration/framework
+++ b/test/integration/framework
@@ -687,10 +687,17 @@ signreleasefiles() {
 	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
-		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
diff --git a/test/integration/test-ubuntu-bug346386 b/test/integration/test-ubuntu-bug346386
new file mode 100755
index 000000000..57004f343
--- /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 3c476ad05..c7b815925 100644
--- 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();
-      }
 
-      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;
 }
-- 
cgit v1.2.3


From a38a00b981de3031a51e76c8a2e220b59557c469 Mon Sep 17 00:00:00 2001
From: Michael Vogt <michael.vogt@ubuntu.com>
Date: Tue, 10 Jul 2012 12:26:15 +0200
Subject: always send content-length via the new addDataHeaders() to ensure
 w3m/curl are happy too for 404 pages and to comply with the http 1.1 spec

---
 test/interactive-helper/aptwebserver.cc | 34 +++++++++++++++++++++------------
 1 file changed, 22 insertions(+), 12 deletions(-)

(limited to 'test')

diff --git a/test/interactive-helper/aptwebserver.cc b/test/interactive-helper/aptwebserver.cc
index c7b815925..ebe04d2a3 100644
--- a/test/interactive-helper/aptwebserver.cc
+++ b/test/interactive-helper/aptwebserver.cc
@@ -78,6 +78,13 @@ void addFileHeaders(std::list<std::string> &headers, FileFd &data) { /*{{{*/
    lastmodified.append(TimeRFC1123(data.ModificationTime()));
    headers.push_back(lastmodified);
 } /*}}}*/
+
+void addDataHeaders(std::list<std::string> &headers, std::string &data) {/*{{{*/
+   std::ostringstream contentlength;
+   contentlength << "Content-Length: " << data.size();
+   headers.push_back(contentlength.str());
+} /*}}}*/
+
 bool sendHead(int client, int httpcode, std::list<std::string> &headers) { /*{{{*/
    string response("HTTP/1.1 ");
    response.append(httpcodeToStr(httpcode));
@@ -124,14 +131,16 @@ bool sendData(int client, std::string &data) { /*{{{*/
 
 void sendError(int client, int httpcode, string request, bool content) { /*{{{*/
    std::list<std::string> headers;
+   string response;   
+   if (content == true) {
+      response.append("<html><head><title>");
+      response.append(httpcodeToStr(httpcode)).append("</title></head>");
+      response.append("<body><h1>").append(httpcodeToStr(httpcode)).append("</h1");
+      response.append("This error is a result of the request: <pre>");
+      response.append(request).append("</pre></body></html>");
+      addDataHeaders(headers, response);
+   }
    sendHead(client, httpcode, headers);
-   if (content == false)
-      return;
-   string response("<html><head><title>");
-   response.append(httpcodeToStr(httpcode)).append("</title></head>");
-   response.append("<body><h1>").append(httpcodeToStr(httpcode)).append("</h1");
-   response.append("This error is a result of the request: <pre>");
-   response.append(request).append("</pre></body></html>");
    sendData(client, response);
 } /*}}}*/
 
@@ -219,8 +228,9 @@ int main(int argc, const char *argv[])
 	    string filename = m->substr(5, filestart - 5);
 
             if (simulate_broken_server == true) {
+               string data("ni ni ni\n");
+               addDataHeaders(headers, data);
                sendHead(client, 200, headers);
-               string data("ni ni ni");
                sendData(client, data);
             }
 	    else if (RealFileExists(filename) == false)
@@ -244,11 +254,11 @@ int main(int argc, const char *argv[])
 	 }
 	 _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;
 }
-- 
cgit v1.2.3


From 3ce22d4f714414d6deb8b044c5b08a8fe7a78967 Mon Sep 17 00:00:00 2001
From: Michael Vogt <michael.vogt@ubuntu.com>
Date: Tue, 10 Jul 2012 13:19:54 +0200
Subject: cleanup, thanks to donkult for his feedback

---
 test/integration/framework              | 9 +++------
 test/integration/test-ubuntu-bug346386  | 2 +-
 test/interactive-helper/aptwebserver.cc | 2 +-
 3 files changed, 5 insertions(+), 8 deletions(-)

(limited to 'test')

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);
    }
-- 
cgit v1.2.3


From 549b49394848d051dc116600571df55d7160eeaa Mon Sep 17 00:00:00 2001
From: Michael Vogt <michael.vogt@ubuntu.com>
Date: Tue, 10 Jul 2012 14:10:19 +0200
Subject: improve test some more

---
 test/integration/framework             |  1 +
 test/integration/test-ubuntu-bug346386 | 32 ++++++++++++++++++++++++++++++--
 2 files changed, 31 insertions(+), 2 deletions(-)

(limited to 'test')

diff --git a/test/integration/framework b/test/integration/framework
index 8f37d4a03..d15fd0e01 100644
--- a/test/integration/framework
+++ b/test/integration/framework
@@ -688,6 +688,7 @@ signreleasefiles() {
 }
 
 changetowebserver() {
+
         if [ -n "$1" ] && ! test -x ${BUILDDIRECTORY}/aptwebserver; then
             msgdie 'Need the aptwebserver when passing arguments'
         fi
diff --git a/test/integration/test-ubuntu-bug346386 b/test/integration/test-ubuntu-bug346386
index a5f502853..1fbfb5ca4 100755
--- a/test/integration/test-ubuntu-bug346386
+++ b/test/integration/test-ubuntu-bug346386
@@ -1,6 +1,24 @@
 #!/bin/sh
 set -e
 
+ensure_n_canary_strings_in_dir() {
+    DIR=$1
+    CANARY_STRING=$2
+    EXPECTED_N=$3
+
+    msgtest "Testing for $EXPECTED_N canary strings '$CANARY_STRING' in in $DIR"
+    
+
+    N=$(grep "$CANARY_STRING" $DIR/* 2>/dev/null |wc -l )
+    if [ "$N" = "$EXPECTED_N" ]; then
+        msgpass
+        return 0
+    else
+        msgfail "Expected $EXPECTED_N canaries, got $N"
+        return 1
+    fi
+}
+
 TESTDIR=$(readlink -f $(dirname $0))
 . $TESTDIR/framework
 
@@ -13,7 +31,17 @@ setupaptarchive
 changetowebserver --simulate-paywall
 
 rm -rf rootdir/var/lib/apt/lists
-aptget update 
-testequal 'partial' "$(ls rootdir/var/lib/apt/lists/)"
+if aptget update -qq 2>/dev/null; then
+    msgfail "excpected apt-get update failure"
+fi
+ensure_n_canary_strings_in_dir rootdir/var/lib/apt/lists/ "ni ni ni" 0
+testequal 'partial' ls rootdir/var/lib/apt/lists/
 
+# again, this time with pre-existing files valid data
+for f in Release Release.gpg main_binary-amd64_Packages stable_main_source_Sources; do 
+    echo "canary" > rootdir/var/lib/apt/lists/localhost:8080_dists_stable_${f}
+done
+# this will fail, the important part is that the canaries remain
+aptget update -qq 2>/dev/null || true
+ensure_n_canary_strings_in_dir rootdir/var/lib/apt/lists/ "canary" 4
 
-- 
cgit v1.2.3