commit 104fd67545d559286d4823ccfd14be41378c6b4c Author: Arturo Filastò <art@fuffa.org> Date: Thu Nov 22 15:20:47 2012 +0100 Avoid that scapy's log function overrides the import of ooni.log --- nettests/core/traceroute.py | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/nettests/core/traceroute.py b/nettests/core/traceroute.py index bbbe14e..a6fc9f1 100644 --- a/nettests/core/traceroute.py +++ b/nettests/core/traceroute.py @@ -6,11 +6,12 @@ from twisted.python import usage from twisted.internet import defer -from ooni.utils import log from ooni.templates import scapyt from scapy.all import * +from ooni.utils import log + class UsageOptions(usage.Options): optParameters = [ ['backend', 'b', '8.8.8.8', 'Test backend to use'], @@ -48,6 +49,7 @@ class TracerouteTest(scapyt.BaseScapyTest): self.report['timeout'] = timeout return max_ttl, timeout + def test_tcp_traceroute(self): """ Does a traceroute to the destination by sending TCP SYN packets