|
@@ -18,6 +18,7 @@
|
|
|
# Tests for proxy app.
|
|
# Tests for proxy app.
|
|
|
|
|
|
|
|
import threading
|
|
import threading
|
|
|
|
|
+import logging
|
|
|
import BaseHTTPServer
|
|
import BaseHTTPServer
|
|
|
import StringIO
|
|
import StringIO
|
|
|
|
|
|
|
@@ -28,6 +29,7 @@ from desktop.lib.django_test_util import make_logged_in_client
|
|
|
from proxy.views import _rewrite_links
|
|
from proxy.views import _rewrite_links
|
|
|
import proxy.conf
|
|
import proxy.conf
|
|
|
|
|
|
|
|
|
|
+
|
|
|
class Handler(BaseHTTPServer.BaseHTTPRequestHandler):
|
|
class Handler(BaseHTTPServer.BaseHTTPRequestHandler):
|
|
|
"""
|
|
"""
|
|
|
To avoid mocking out urllib, we setup a web server
|
|
To avoid mocking out urllib, we setup a web server
|
|
@@ -52,6 +54,13 @@ class Handler(BaseHTTPServer.BaseHTTPRequestHandler):
|
|
|
# number of bytes the test sends.
|
|
# number of bytes the test sends.
|
|
|
self.wfile.write("Data: " + self.rfile.read(16))
|
|
self.wfile.write("Data: " + self.rfile.read(16))
|
|
|
|
|
|
|
|
|
|
+ def log_message(self, fmt, *args):
|
|
|
|
|
+ logging.debug("%s - - [%s] %s" %
|
|
|
|
|
+ (self.address_string(),
|
|
|
|
|
+ self.log_date_time_string(),
|
|
|
|
|
+ fmt % args))
|
|
|
|
|
+
|
|
|
|
|
+
|
|
|
def run_test_server():
|
|
def run_test_server():
|
|
|
"""
|
|
"""
|
|
|
Returns the server, and a method to close it out.
|
|
Returns the server, and a method to close it out.
|