Skip to content
Browse files

Test suite, remove extraneous code.

  • Loading branch information...
1 parent 1e0bab6 commit 57f01ffb07a7f32fa9679787e8894cf4917b022b @cortesi committed Jan 28, 2013
Showing with 10 additions and 11 deletions.
  1. +2 −5 libmproxy/proxy.py
  2. +1 −1 scripts/contributors
  3. +7 −5 test/test_proxy.py
View
7 libmproxy/proxy.py
@@ -96,11 +96,8 @@ def send(self, request):
d = request._assemble()
if not d:
raise ProxyError(502, "Cannot transmit an incomplete request.")
- try:
- self.wfile.write(d)
- self.wfile.flush()
- except socket.error, err:
- raise ProxyError(502, 'Error sending data to "%s": %s' % (request.host, err))
+ self.wfile.write(d)
+ self.wfile.flush()
def terminate(self):
try:
View
2 scripts/contributors
@@ -1,2 +1,2 @@
#!/bin/sh
-git log | grep "^Author:" | sed 's/ <.*//; s/^Author: //' | sort | uniq -c | sort -nr
+git shortlog -n -s
View
12 test/test_proxy.py
@@ -2,6 +2,7 @@
import tutils
from libpathod import test
from netlib import http
+import mock
def test_proxy_error():
@@ -30,7 +31,6 @@ def test_app_registry():
assert ar.get(r)
-
class TestServerConnection:
def setUp(self):
self.d = test.Daemon()
@@ -50,9 +50,11 @@ def test_simple(self):
r.content = flow.CONTENT_MISSING
tutils.raises("incomplete request", sc.send, r)
- def test_send_error(self):
+ sc.terminate()
+
+ def test_terminate_error(self):
sc = proxy.ServerConnection(proxy.ProxyConfig(), self.d.IFACE, self.d.port)
sc.connect("http")
- r = tutils.treq()
- sc.send(r)
-
+ sc.connection = mock.Mock()
+ sc.connection.close = mock.Mock(side_effect=IOError)
+ sc.terminate()

0 comments on commit 57f01ff

Please sign in to comment.
Something went wrong with that request. Please try again.