tahoe-lafs/tahoe-lafs
tahoe-lafs
/
tahoe-lafs
2
0
Fork 0
Code Issues Pull Requests 23 Packages Projects Releases 1 Wiki Activity

use existing port-allocator instead

This commit is contained in:
meejah 2023-07-29 13:15:21 -06:00
parent c4ac548cba
commit fe96defa2b
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
integration/conftest.py
View File

@ -21,7 +21,7 @@ from eliot import (
from twisted.python.filepath import FilePath from twisted.python.filepath import FilePath
from twisted.python.procutils import which from twisted.python.procutils import which
from twisted.internet.defer import DeferredList from twisted.internet.defer import DeferredList, succeed
from twisted.internet.error import ( from twisted.internet.error import (
ProcessExitedAlready, ProcessExitedAlready,
ProcessTerminated, ProcessTerminated,
@ -117,7 +117,16 @@ def reactor():
@pytest.fixture(scope='session') @pytest.fixture(scope='session')
@log_call(action_type=u"integration:port_allocator", include_result=False) @log_call(action_type=u"integration:port_allocator", include_result=False)
def port_allocator(reactor): def port_allocator(reactor):
return create_port_allocator(reactor, start_port=45000) from allmydata.util.iputil import allocate_tcp_port
# these will appear basically random, which can make especially
# manual debugging harder but we're re-using code instead of
# writing our own...so, win?
def allocate():
port = allocate_tcp_port()
return succeed(port)
return allocate
#return create_port_allocator(reactor, start_port=45000)
@pytest.fixture(scope='session') @pytest.fixture(scope='session')