[tor-commits] [ooni-probe/master] Removed cerealizer because it sometimes causes the reporter to hang.

[isis at torproject.org]

commit 20137d4b331ca8d3016708a8641e6f31f0b9ef72
Author: Isis Lovecruft <isis at torproject.org>
Date:   Sun Nov 25 13:40:14 2012 +0000

    Removed cerealizer because it sometimes causes the reporter to hang.
---
 nettests/bridge_reachability/tcpsyn.py |   22 ++--------------------
 1 files changed, 2 insertions(+), 20 deletions(-)

diff --git a/nettests/bridge_reachability/tcpsyn.py b/nettests/bridge_reachability/tcpsyn.py
index ed11c9d..54271bf 100644
--- a/nettests/bridge_reachability/tcpsyn.py
+++ b/nettests/bridge_reachability/tcpsyn.py
@@ -62,7 +62,6 @@ class TCPSynTest(nettest.NetTestCase):
 
     destinations = {}
 
-    @log.catcher
     def setUp(self, *a, **kw):
         """Configure commandline parameters for TCPSynTest."""
         if self.localOptions:
@@ -70,26 +69,12 @@ class TCPSynTest(nettest.NetTestCase):
                 setattr(self, key, value)
         if not self.interface:
             try:
-                iface = net.getDefaultIface()
+                iface = log.catcher(net.getDefaultIface())
             except net.IfaceError, ie:
-                log.msg("Could not find a working network interface!")
-            except Exception, ex:
-                log.exception(ex)
+                log.warn("Could not find a working network interface!")
             else:
                 log.msg("Using system default interface: %s" % iface)
                 self.interface = iface
-        if self.cerealize:
-            if True:
-                raise NotImplemented("need handler for type(dictproxy)...")
-            else:
-                from Cerealize import cerealizer
-                self.cheerios = Cerealize.cerealizer()
-                mind = ['scapy.layers.inet.IP',
-                        'scapy.base_classes.Packet_metaclass',
-                        'scapy.plist.SndRcvList']
-                for spoon in mind:
-                    __import__(spoon)
-                    self.cheerios.register(spoon)
 
     def addToDestinations(self, addr, port):
         dst, dport = net.checkIPandPort(addr, port)
@@ -161,9 +146,6 @@ class TCPSynTest(nettest.NetTestCase):
                 if self.hexdump:
                     request_data.update('hexdump', q.hexdump())
                     response_data.update('hexdump', r.hexdump())
-                if self.cerealize:
-                    pass
-
                 for dest, data in self.destinations.items():
                     if data['dst'] == response_data['src']:
                         if not 'reachable' in data: