Git-Mirrors/brozzler
1
0
Fork 0
mirror of https://github.com/internetarchive/brozzler.git synced 2025-02-24 00:29:53 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix _find_available_port and its unit test

Browse Source
This commit is contained in:
Noah Levitt 2016-12-07 14:08:34 -08:00
parent eed8b9ec30
commit 9bcec54f4b
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
brozzler/chrome.py
View File

@ -59,7 +59,7 @@ class Chrome:
except psutil.AccessDenied: except psutil.AccessDenied:
return default_port return default_port
if any(conn.laddr[1] == default_port for conn in conns): if not any(conn.laddr[1] == default_port for conn in conns):
return default_port return default_port
for p in range(9999,8999,-1): for p in range(9999,8999,-1):

2
setup.py
View File

@ -32,7 +32,7 @@ def find_package_data(package):
setuptools.setup( setuptools.setup(
name='brozzler', name='brozzler',
version='1.1b8.dev137', version='1.1b8.dev138',
description='Distributed web crawling with browsers', description='Distributed web crawling with browsers',
url='https://github.com/internetarchive/brozzler', url='https://github.com/internetarchive/brozzler',
author='Noah Levitt', author='Noah Levitt',

8
tests/test_units.py
View File

@ -57,6 +57,7 @@ def test_robots(httpd):
assert not brozzler.is_permitted_by_robots(site, url) assert not brozzler.is_permitted_by_robots(site, url)
def test_find_available_port(): def test_find_available_port():
x = brozzler.chrome.Chrome(None, None)
try: try:
psutil.net_connections(kind='tcp') psutil.net_connections(kind='tcp')
except psutil.AccessDenied: except psutil.AccessDenied:
@ -64,10 +65,11 @@ def test_find_available_port():
'skipping _find_available_port() test because ' 'skipping _find_available_port() test because '
'psutil.net_connections(kind="tcp") raised AccessDenied') 'psutil.net_connections(kind="tcp") raised AccessDenied')
return return
assert brozzler.chrome.Chrome._find_available_port(None, 9800) == 9800 assert x._find_available_port(9800) == 9800
sock = socket.socket() sock = socket.socket()
sock.bind(('localhost', 9800)) sock.bind(('localhost', 9800))
assert brozzler.chrome.Chrome._find_available_port(None, 9800) == 9999 sock.listen(0)
assert x._find_available_port(9800) == 9999
sock.close() sock.close()
assert brozzler.chrome.Chrome._find_available_port(None, 9800) == 9800 assert x._find_available_port(9800) == 9800