diff options
| author | Tom Harding <tomh@thinlink.com> | 2014-07-13 10:41:12 -0700 |
|---|---|---|
| committer | Tom Harding <tomh@thinlink.com> | 2014-07-13 10:41:12 -0700 |
| commit | cdf305eeb042eb67c5e53a8b04cf475578b0f8e8 (patch) | |
| tree | cf911ab44cf539c3c92cec447b93c46d1cdd828a /qa | |
| parent | 29ef38951431fcce4a8692a652e99325d2a3795c (diff) | |
| download | bitcoin-cdf305eeb042eb67c5e53a8b04cf475578b0f8e8.tar.xz | |
Set -discover=0 in regtest framework
The regtest framework is local, so often there is no need to
discover our external IP. Setting -discover=0 in util.py works
around shutdown hang caused by GetExternalIP waiting in recv().
Diffstat (limited to 'qa')
| -rw-r--r-- | qa/rpc-tests/util.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/qa/rpc-tests/util.py b/qa/rpc-tests/util.py index 0a7f26ffcd..9d8e9d6a8c 100644 --- a/qa/rpc-tests/util.py +++ b/qa/rpc-tests/util.py @@ -85,7 +85,7 @@ def initialize_chain(test_dir): # Create cache directories, run bitcoinds: for i in range(4): datadir=initialize_datadir("cache", i) - args = [ "bitcoind", "-keypool=1", "-datadir="+datadir ] + args = [ "bitcoind", "-keypool=1", "-datadir="+datadir, "-discover=0" ] if i > 0: args.append("-connect=127.0.0.1:"+str(p2p_port(0))) bitcoind_processes[i] = subprocess.Popen(args) @@ -147,7 +147,7 @@ def start_node(i, dir, extra_args=None, rpchost=None): Start a bitcoind and return RPC connection to it """ datadir = os.path.join(dir, "node"+str(i)) - args = [ "bitcoind", "-datadir="+datadir, "-keypool=1" ] + args = [ "bitcoind", "-datadir="+datadir, "-keypool=1", "-discover=0" ] if extra_args is not None: args.extend(extra_args) bitcoind_processes[i] = subprocess.Popen(args) devnull = open("/dev/null", "w+") |