commit 4d15117d2cf23af454d29494fdc42a084f658af0 Merge: eaecafe 214c626 Author: Isis Lovecruft <isis@torproject.org> Date: Fri Nov 30 12:08:43 2012 +0000 Merge branch 'tcpsyn-report' into tcpsyn-port Conflicts: nettests/bridge_reachability/tcpsyn.py nettests/bridge_reachability/tcpsyn.py | 220 ++++++++++++++++++-------------- ooni/nettest.py | 5 + ooni/oonicli.py | 10 +- ooni/reporter.py | 19 ++- ooni/runner.py | 4 +- ooni/utils/__init__.py | 2 - ooni/utils/geodata.py | 16 ++- ooni/utils/hacks.py | 1 - ooni/utils/log.py | 14 ++- ooniprobe.conf | 8 +- 10 files changed, 183 insertions(+), 116 deletions(-) diff --cc nettests/bridge_reachability/tcpsyn.py index ed11c9d,dd7f494..39c882b --- a/nettests/bridge_reachability/tcpsyn.py +++ b/nettests/bridge_reachability/tcpsyn.py @@@ -57,14 -58,15 +58,16 @@@ class TCPFlagTest(nettest.NetTestCase) version = '0.0.1' requiresRoot = True - usageOptions = UsageOptions + usageOptions = TCPFlagOptions inputFile = ['file', 'f', None, 'File of list of IP:PORTs to ping'] - destinations = {} + #destinations = {} + @log.catcher def setUp(self, *a, **kw): """Configure commandline parameters for TCPSynTest.""" + self.report = {} + if self.localOptions: for key, value in self.localOptions.items(): setattr(self, key, value)