[tor-commits] [tor/release-0.3.5] In test_rebind.py, log stuff with timestamps

[nickm@xxxxxxxxxxxxxx]

commit 320f5f30b35695adf1cb1254f26af3b87ec4d2a3
Author: rl1987 <rl1987@xxxxxxxxxxxxxxxx>
Date:   Sun Nov 4 18:09:31 2018 +0200

    In test_rebind.py, log stuff with timestamps
---
 src/test/test_rebind.py | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/test/test_rebind.py b/src/test/test_rebind.py
index c63341a68..64eba14f0 100644
--- a/src/test/test_rebind.py
+++ b/src/test/test_rebind.py
@@ -1,6 +1,7 @@
 from __future__ import print_function
 
 import errno
+import logging
 import os
 import random
 import socket
@@ -13,7 +14,7 @@ LOG_WAIT = 0.1
 LOG_CHECK_LIMIT = LOG_TIMEOUT / LOG_WAIT
 
 def fail(msg):
-    print('FAIL')
+    logging.error('FAIL')
     sys.exit(msg)
 
 def try_connecting_to_socksport():
@@ -30,7 +31,7 @@ def wait_for_log(s):
         l = l.decode('utf8')
         if s in l:
             return
-        print('Tor logged: "{}", waiting for "{}"'.format(l.strip(), s))
+        logging.info('Tor logged: "{}", waiting for "{}"'.format(l.strip(), s))
         # readline() returns a blank string when there is no output
         # avoid busy-waiting
         if len(s) == 0:
@@ -55,6 +56,10 @@ def pick_random_port():
 
     return port
 
+logging.basicConfig(level=logging.DEBUG,
+                    format='%(asctime)s.%(msecs)03d %(message)s',
+                    datefmt='%Y-%m-%d %H:%M:%S')
+
 if sys.hexversion < 0x02070000:
     fail("ERROR: unsupported Python version (should be >= 2.7)")
 
@@ -108,13 +113,13 @@ try_connecting_to_socksport()
 control_socket.sendall('SIGNAL HALT\r\n'.encode('utf8'))
 
 wait_for_log('exiting cleanly')
-print('OK')
+logging.info('OK')
 
 try:
     tor_process.terminate()
 except OSError as e:
     if e.errno == errno.ESRCH: # errno 3: No such process
         # assume tor has already exited due to SIGNAL HALT
-        print("Tor has already exited")
+        logging.warn("Tor has already exited")
     else:
         raise



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