[tor-commits] [ooni-probe/master] Fix bug that lead to the probe_asn and probe_cc not being set

[art@xxxxxxxxxxxxxx]

commit 29e63ed80eb9298e3ce86f7d4582b2c6ee909afe
Author: Arturo Filastò <arturo@xxxxxxxxxxx>
Date:   Wed Mar 30 14:07:22 2016 +0200

    Fix bug that lead to the probe_asn and probe_cc not being set
---
 ooni/director.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/ooni/director.py b/ooni/director.py
index 4aa5fba..ab8da65 100644
--- a/ooni/director.py
+++ b/ooni/director.py
@@ -241,12 +241,16 @@ class Director(object):
             net_test_loader:
                 an instance of :class:ooni.nettest.NetTestLoader
         """
+        # Here we set the test details again since the geoip lookups may
+        # not have already been done and probe_asn and probe_ip
+        # are not set.
+        net_test_loader.setTestDetails()
+
         if self.allTestsDone.called:
             self.allTestsDone = defer.Deferred()
 
         if config.privacy.includepcap:
             self.startSniffing(net_test_loader.testDetails)
-
         report = Report(net_test_loader.testDetails, report_filename,
                         self.reportEntryManager, collector_address,
                         no_yamloo)



_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits