[tor-commits] [ooni-probe/master] Make it clearer when something is blocked or not blocked

[art at torproject.org]

commit fbaa1758bb426583154c65560ee5a38629819486
Author: Arturo Filastò <arturo at filasto.net>
Date:   Tue Nov 22 12:53:48 2016 +0000

    Make it clearer when something is blocked or not blocked
---
 ooni/nettests/blocking/facebook_messenger.py | 8 ++++----
 ooni/nettests/blocking/web_connectivity.py   | 2 +-
 ooni/nettests/blocking/whatsapp.py           | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/ooni/nettests/blocking/facebook_messenger.py b/ooni/nettests/blocking/facebook_messenger.py
index bf95126..c63d97a 100644
--- a/ooni/nettests/blocking/facebook_messenger.py
+++ b/ooni/nettests/blocking/facebook_messenger.py
@@ -104,7 +104,7 @@ class FacebookMessengerTest(httpt.HTTPTest, dnst.DNSTest):
                     tcp_blocked = True
 
             if tcp_blocked == True:
-                log.msg("{0} server is blocked based on TCP".format(key))
+                log.msg("{0} server is BLOCKED based on TCP".format(key))
             self.report['facebook-{0}-reachable'.format(key)] = not tcp_blocked
 
     @defer.inlineCallbacks
@@ -126,7 +126,7 @@ class FacebookMessengerTest(httpt.HTTPTest, dnst.DNSTest):
                 if consistent == True:
                     msg += "consistent DNS"
                 else:
-                    msg += "inconsistent DNS"
+                    msg += "INCONSISTENT DNS"
                 log.msg(msg)
                 self.report['facebook-{0}-dns-consistent'.format(key)] = consistent
 
@@ -141,7 +141,7 @@ class FacebookMessengerTest(httpt.HTTPTest, dnst.DNSTest):
         for key in FB_HOSTNAMES.keys():
             if self.report['facebook-{0}-dns-consistent'.format(key)] == False:
                 dns_blocking = True
-                log.msg("{0} is blocked due to DNS blocking".format(key))
+                log.msg("{0} is BLOCKED due to DNS blocking".format(key))
                 continue
 
             # XXX We ignore stun reachability as it requires UDP
@@ -149,7 +149,7 @@ class FacebookMessengerTest(httpt.HTTPTest, dnst.DNSTest):
                 continue
             if self.report['facebook-{0}-reachable'.format(key)] == False:
                 tcp_blocking = True
-                log.msg("{0} is blocked due to TCP/IP blocking".format(key))
+                log.msg("{0} is BLOCKED due to TCP/IP blocking".format(key))
                 continue
             log.msg("{0} no blocking detected".format(key))
 
diff --git a/ooni/nettests/blocking/web_connectivity.py b/ooni/nettests/blocking/web_connectivity.py
index 1d5cf1f..629ef1c 100644
--- a/ooni/nettests/blocking/web_connectivity.py
+++ b/ooni/nettests/blocking/web_connectivity.py
@@ -38,7 +38,7 @@ class UsageOptions(usage.Options):
     ]
 
 
-    class WebConnectivityTest(httpt.HTTPTest, dnst.DNSTest):
+class WebConnectivityTest(httpt.HTTPTest, dnst.DNSTest):
     """
     Web connectivity
     """
diff --git a/ooni/nettests/blocking/whatsapp.py b/ooni/nettests/blocking/whatsapp.py
index 55f9c02..8df2d24 100644
--- a/ooni/nettests/blocking/whatsapp.py
+++ b/ooni/nettests/blocking/whatsapp.py
@@ -379,7 +379,7 @@ class WhatsappTest(httpt.HTTPTest, dnst.DNSTest):
                 continue
 
         if ip_in_whats_app_network == False:
-            log.msg("%s presents an inconsistent DNS response" % hostname)
+            log.msg("%s presents an INCONSISTENT DNS response" % hostname)
             self.report['whatsapp_endpoints_status'] = 'blocked'
             self.report['whatsapp_endpoints_dns_inconsistent'].append(hostname)
 
@@ -394,7 +394,7 @@ class WhatsappTest(httpt.HTTPTest, dnst.DNSTest):
                 tcp_blocked = True
 
         if tcp_blocked == True:
-            log.msg("%s is blocked based on TCP" % hostname)
+            log.msg("%s is BLOCKED based on TCP" % hostname)
             self.report['whatsapp_endpoints_blocked'].append(hostname)
             self.report['whatsapp_endpoints_status'] = 'blocked'
         else: