mirrors/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2025-02-25 07:07:52 +01:00
Code Issues Projects Releases Wiki Activity

Update/fix CI build

Browse source 
Update integration test to Python 3
This commit is contained in:
rl1987 2018-08-05 16:27:49 +03:00 • committed by Nick Mathewson
parent 4811869d7a
commit 5a11670fca
2 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/test/test_rebind.py
View file

@ -1,3 +1,5 @@
#!/usr/bin/python3
from __future__ import print_function from __future__ import print_function
import sys import sys
@ -18,14 +20,14 @@ def try_connecting_to_socksport():
def wait_for_log(s): def wait_for_log(s):
while True: while True:
l = tor_process.stdout.readline() l = tor_process.stdout.readline()
if s in l: if s in l.decode('utf8'):
return return
def pick_random_port(): def pick_random_port():
port = 0 port = 0
random.seed() random.seed()
for i in xrange(8): for i in range(8):
port = random.randint(10000, 60000) port = random.randint(10000, 60000)
s = socket.socket(socket.AF_INET, socket.SOCK_STREAM) s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
if s.connect_ex(('127.0.0.1', port)) == 0: if s.connect_ex(('127.0.0.1', port)) == 0:
@ -69,18 +71,18 @@ if control_socket.connect_ex(('127.0.0.1', control_port)):
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'.encode('utf8'))
control_socket.sendall('SETCONF SOCKSPort=0.0.0.0:{}\r\n'.format(socks_port)) control_socket.sendall('SETCONF SOCKSPort=0.0.0.0:{}\r\n'.format(socks_port).encode('utf8'))
wait_for_log('Opened Socks listener') wait_for_log('Opened Socks listener')
try_connecting_to_socksport() try_connecting_to_socksport()
control_socket.sendall('SETCONF SOCKSPort=127.0.0.1:{}\r\n'.format(socks_port)) control_socket.sendall('SETCONF SOCKSPort=127.0.0.1:{}\r\n'.format(socks_port).encode('utf8'))
wait_for_log('Opened Socks listener') wait_for_log('Opened Socks listener')
try_connecting_to_socksport() try_connecting_to_socksport()
control_socket.sendall('SIGNAL HALT\r\n') control_socket.sendall('SIGNAL HALT\r\n'.encode('utf8'))
time.sleep(0.1) time.sleep(0.1)
print('OK') print('OK')

2
src/test/test_rebind.sh
View file

@ -1,5 +1,7 @@
#!/bin/sh #!/bin/sh
set -x
exitcode=0 exitcode=0
"${PYTHON:-python}" "${abs_top_srcdir:-.}/src/test/test_rebind.py" "${TESTING_TOR_BINARY}" || exitcode=1 "${PYTHON:-python}" "${abs_top_srcdir:-.}/src/test/test_rebind.py" "${TESTING_TOR_BINARY}" || exitcode=1