[tor-commits] [ooni-probe/master] Return failure in errback so the exception can propagate to the caller

commit ea512b157494052c42898d0f000aeb5069f13cbf Author: Arturo Filastò arturo@filasto.net Date: Wed Oct 12 17:54:36 2016 +0200

Return failure in errback so the exception can propagate to the caller --- ooni/nettests/blocking/facebook_messenger.py | 1 + ooni/nettests/blocking/whatsapp.py | 1 + 2 files changed, 2 insertions(+)

diff --git a/ooni/nettests/blocking/facebook_messenger.py b/ooni/nettests/blocking/facebook_messenger.py index fd6441a..37c6bac 100644 --- a/ooni/nettests/blocking/facebook_messenger.py +++ b/ooni/nettests/blocking/facebook_messenger.py @@ -84,6 +84,7 @@ class FacebookMessengerTest(httpt.HTTPTest, dnst.DNSTest): result['status']['success'] = False result['status']['failure'] = failureToString(failure) self.report['tcp_connect'].append(result) + return failure

return d

diff --git a/ooni/nettests/blocking/whatsapp.py b/ooni/nettests/blocking/whatsapp.py index 9b68f30..2f12414 100644 --- a/ooni/nettests/blocking/whatsapp.py +++ b/ooni/nettests/blocking/whatsapp.py @@ -333,6 +333,7 @@ class WhatsappTest(httpt.HTTPTest, dnst.DNSTest): result['status']['success'] = False result['status']['failure'] = failureToString(failure) self.report['tcp_connect'].append(result) + return failure

return d