commit ea4cf26068195e30caf62be695f5febfc2b46d47 Merge: 5856e93 b96afa0 Author: Arturo Filastò art@fuffa.org Date: Tue May 14 17:48:43 2013 +0200
Merge branch 'fix_pcap_filename'
* fix_pcap_filename: Fix import error for pushFilenameStack Set pcap name for each NetTest, and use consistent timestamps.
ooni/config.py | 23 ++++------------------- ooni/director.py | 22 +++++++++++++--------- ooni/nettest.py | 5 ++--- ooni/otime.py | 2 ++ 4 files changed, 21 insertions(+), 31 deletions(-)
diff --cc ooni/nettest.py index f31488e,cd8ab05..6bbb99e --- a/ooni/nettest.py +++ b/ooni/nettest.py @@@ -7,11 -7,9 +7,10 @@@ from twisted.python import usage, refle
from ooni import geoip from ooni.tasks import Measurement -from ooni.utils import log, checkForRoot, geodata +from ooni.utils import log, checkForRoot +from ooni import geoip from ooni import config - from ooni import otime - + import time from ooni import errors as e
from inspect import getmembers