From 39b534246f6553f04d87d6772fd68b801422a1ba Mon Sep 17 00:00:00 2001
From: Valentin Lorentz <progval@progval.net>
Date: Fri, 1 Feb 2013 20:38:01 +0100
Subject: [PATCH] Fix http server's tests.

---
 src/httpserver.py |  4 ++--
 src/test.py       | 10 ++--------
 2 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/src/httpserver.py b/src/httpserver.py
index f4b68ae96..04373c711 100644
--- a/src/httpserver.py
+++ b/src/httpserver.py
@@ -84,7 +84,7 @@ class RealSupyHTTPServer(HTTPServer):
 
 class TestSupyHTTPServer(RealSupyHTTPServer):
     def __init__(self, *args, **kwargs):
-        pass
+        self.callbacks = {}
     def serve_forever(self, *args, **kwargs):
         pass
     def shutdown(self, *args, **kwargs):
@@ -151,7 +151,7 @@ class SupyHTTPServerCallback:
     neither overriden this message or defined an handler for this query.""")
 
     def doGet(self, handler, path, *args, **kwargs):
-        handler.send_response(404)
+        handler.send_response(400)
         self.send_header('Content_type', 'text/plain; charset=utf-8')
         self.send_header('Content-Length', len(self.defaultResponse))
         self.end_headers()
diff --git a/src/test.py b/src/test.py
index e312a1442..391c122fc 100644
--- a/src/test.py
+++ b/src/test.py
@@ -493,14 +493,6 @@ class ChannelPluginTestCase(PluginTestCase):
             frm = self.prefix
         self.irc.feedMsg(ircmsgs.privmsg(to, query, prefix=frm))
 
-class TestSupyHTTPServer(httpserver.SupyHTTPServer):
-    def __init__(self, *args, **kwargs):
-        pass
-    def serve_forever(self, *args, **kwargs):
-        pass
-    def shutdown(self, *args, **kwargs):
-        pass
-
 class TestRequestHandler(httpserver.SupyHTTPRequestHandler):
     def __init__(self, rfile, wfile, *args, **kwargs):
         self._headers_mode = True
@@ -524,6 +516,8 @@ class TestRequestHandler(httpserver.SupyHTTPRequestHandler):
         self.server = httpserver.http_servers[0]
         httpserver.SupyHTTPRequestHandler.do_X(self, *args, **kwargs)
 
+httpserver.http_servers = [httpserver.TestSupyHTTPServer()]
+
 # Partially stolen from the standart Python library :)
 def open_http(url, data=None):
     """Use HTTP protocol."""