[tor-commits] [ooni-probe/master] Use handleAllFailures inside of the HTTP Test template

[art at torproject.org]

commit 7c3ff8da8321f8ac0cbed3c96e93be844689da8e
Author: Arturo Filastò <art at fuffa.org>
Date:   Sun Dec 23 23:57:19 2012 +0100

    Use handleAllFailures inside of the HTTP Test template
---
 ooni/templates/httpt.py |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/ooni/templates/httpt.py b/ooni/templates/httpt.py
index b350ae8..9debfa9 100644
--- a/ooni/templates/httpt.py
+++ b/ooni/templates/httpt.py
@@ -99,7 +99,7 @@ class HTTPTest(NetTestCase):
     def processInputs(self):
         pass
 
-    def addToReport(self, request, response=None, response_body=None, failure=None):
+    def addToReport(self, request, response=None, response_body=None, failure_string=None):
         """
         Adds to the report the specified request and response.
 
@@ -128,8 +128,8 @@ class HTTPTest(NetTestCase):
                 'body': response_body,
                 'code': response.code
         }
-        if failure:
-            request_response['failure'] = failureToString(failure)
+        if failure_string:
+            request_response['failure'] = failure_string
 
         self.report['requests'].append(request_response)
 
@@ -297,9 +297,9 @@ class HTTPTest(NetTestCase):
         headers = TrueHeaders(request['headers'])
 
         def errback(failure, request):
-            failure.trap(ConnectionRefusedError, SOCKSError, DNSLookupError, TCPTimedOutError)
+            failure_string = handleAllFailures(failure)
             log.err("Error performing %s" % request)
-            self.addToReport(request, failure=failure)
+            self.addToReport(request, failure=failure_string)
             return
 
         d = agent.request(request['method'], request['url'], headers,