[tor-commits] [ooni-probe/master] Make TCPScan log timestamps

[art at torproject.org]

commit bb0546b82139f8191e389d96b4cab238f49a21d0
Author: Arturo Filastò <hellais at gmail.com>
Date:   Mon Mar 12 11:53:08 2012 -0700

    Make TCPScan log timestamps
---
 assets/tcpscan.txt |    1 +
 tests/tcpscan.py   |    6 ++++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/assets/tcpscan.txt b/assets/tcpscan.txt
index e69de29..f67dce3 100644
--- a/assets/tcpscan.txt
+++ b/assets/tcpscan.txt
@@ -0,0 +1 @@
+127.0.0.1:9050
diff --git a/tests/tcpscan.py b/tests/tcpscan.py
index 38322a1..9e962ca 100644
--- a/tests/tcpscan.py
+++ b/tests/tcpscan.py
@@ -7,7 +7,7 @@
 """
 import os
 import socket
-
+from datetime import datetime
 import socks
 
 from plugoo.assets import Asset
@@ -50,7 +50,9 @@ class TCPScan(Test):
         finally:
             s.close()
 
-        return (addr, res)
+        return {'Time': datetime.now(),
+                'Address': addr,
+                'Status': res}
 
     def control(self):
         """