nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-24 12:23:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

Tweak test_rebind.py for future-proofness

Browse Source
This commit is contained in:
rl1987 2018-05-22 17:36:06 +02:00 committed by Nick Mathewson
parent 762c27b907
commit 3f34fc921c
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/test/test_rebind.py
View File

@ -1,3 +1,5 @@
from __future__ import print_function
import sys import sys
import subprocess import subprocess
import socket import socket
@ -8,7 +10,7 @@ def try_connecting_to_socksport():
socks_socket = socket.socket(socket.AF_INET, socket.SOCK_STREAM) socks_socket = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
if socks_socket.connect_ex(('127.0.0.1', 9052)): if socks_socket.connect_ex(('127.0.0.1', 9052)):
tor_process.terminate() tor_process.terminate()
print 'FAIL' print('FAIL')
sys.exit('Cannot connect to SOCKSPort') sys.exit('Cannot connect to SOCKSPort')
socks_socket.close() socks_socket.close()
@ -43,7 +45,7 @@ try_connecting_to_socksport()
control_socket = socket.socket(socket.AF_INET, socket.SOCK_STREAM) control_socket = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
if control_socket.connect_ex(('127.0.0.1', 9053)): if control_socket.connect_ex(('127.0.0.1', 9053)):
tor_process.terminate() tor_process.terminate()
print 'FAIL' print('FAIL')
sys.exit('Cannot connect to ControlPort') sys.exit('Cannot connect to ControlPort')
control_socket.sendall('AUTHENTICATE \r\n') control_socket.sendall('AUTHENTICATE \r\n')
@ -60,5 +62,5 @@ try_connecting_to_socksport()
control_socket.sendall('SIGNAL HALT\r\n') control_socket.sendall('SIGNAL HALT\r\n')
time.sleep(0.1) time.sleep(0.1)
print 'OK' print('OK')
tor_process.terminate() tor_process.terminate()