diff options
Diffstat (limited to 'test/functional')
| -rw-r--r-- | test/functional/README.md | 2 | ||||
| -rw-r--r-- | test/functional/test_framework/util.py | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/test/functional/README.md b/test/functional/README.md index 5e3009e6af..197c2afbe4 100644 --- a/test/functional/README.md +++ b/test/functional/README.md @@ -116,7 +116,7 @@ Basic code to support P2P connectivity to a bitcoind. Utilities for manipulating transaction scripts (originally from python-bitcoinlib) #### [test_framework/key.py](test_framework/key.py) -Wrapper around OpenSSL EC_Key (originally from python-bitcoinlib) +Test-only secp256k1 elliptic curve implementation #### [test_framework/bignum.py](test_framework/bignum.py) Helpers for script.py diff --git a/test/functional/test_framework/util.py b/test/functional/test_framework/util.py index 1c254b6755..598e87558b 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 @@ -235,10 +235,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 |