diff options
| author | MarcoFalke <falke.marco@gmail.com> | 2019-09-19 12:07:55 -0400 |
|---|---|---|
| committer | MarcoFalke <falke.marco@gmail.com> | 2019-09-19 12:03:40 -0400 |
| commit | fa69588537bc91c0aedbc89ef1760d89cbffad75 (patch) | |
| tree | 365aef81a93763c38822fb32301b13b00c5ea326 | |
| parent | 7d4bc60f1fee785d355fe4d376c0a369fc64dd68 (diff) | |
test: Make PORT_MIN in test runner configurable
| -rw-r--r-- | .cirrus.yml | 2 | ||||
| -rw-r--r-- | test/functional/test_framework/util.py | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/.cirrus.yml b/.cirrus.yml index 1e6e6937da..9464ec1685 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -9,6 +9,7 @@ task: MAKEJOBS: "-j9" CONFIGURE_OPTS: "--disable-dependency-tracking" GOAL: "install" + TEST_RUNNER_PORT_MIN: "14000" # Must be larger than 12321, which is used for the http cache. See https://cirrus-ci.org/guide/writing-tasks/#http-cache CCACHE_SIZE: "200M" CCACHE_COMPRESS: 1 CCACHE_DIR: "/tmp/ccache_dir" @@ -37,6 +38,7 @@ task: env: MAKEJOBS: "-j9" RUN_CI_ON_HOST: "1" + TEST_RUNNER_PORT_MIN: "14000" # Must be larger than 12321, which is used for the http cache. See https://cirrus-ci.org/guide/writing-tasks/#http-cache CCACHE_SIZE: "200M" CCACHE_DIR: "/tmp/ccache_dir" ccache_cache: diff --git a/test/functional/test_framework/util.py b/test/functional/test_framework/util.py index 3175872b00..6997f54b04 100644 --- a/test/functional/test_framework/util.py +++ b/test/functional/test_framework/util.py @@ -7,13 +7,13 @@ from base64 import b64encode from binascii import unhexlify from decimal import Decimal, ROUND_DOWN +from subprocess import CalledProcessError import inspect import json import logging import os import random import re -from subprocess import CalledProcessError import time from . import coverage @@ -228,10 +228,11 @@ def wait_until(predicate, *, attempts=float('inf'), timeout=float('inf'), lock=N # The maximum number of nodes a single test can spawn MAX_NODES = 12 # Don't assign rpc or p2p ports lower than this -PORT_MIN = 11000 +PORT_MIN = int(os.getenv('TEST_RUNNER_PORT_MIN', default=11000)) # The number of ports to "reserve" for p2p and rpc, each PORT_RANGE = 5000 + class PortSeed: # Must be initialized with a unique integer for each process n = None |