pytest: create only a single config file.

rustyrussell · cdecker · commit 91d62ad69744 · 2018-06-21T13:43:32.000+02:00
For some reason, we created a second bitcoin.conf in the regtest/ directory,
which AFAICT nothing uses.

Signed-off-by: Rusty Russell &lt;rusty@rustcorp.com.au&gt;
diff --git a/tests/utils.py b/tests/utils.py
@@ -241,8 +241,7 @@ def __init__(self, bitcoin_dir="/tmp/bitcoind-test", rpcport=None):
             '-nolisten',
         ]
         BITCOIND_CONFIG['rpcport'] = rpcport
-        btc_conf_file = os.path.join(regtestdir, 'bitcoin.conf')
-        write_config(os.path.join(bitcoin_dir, 'bitcoin.conf'), BITCOIND_CONFIG)
+        btc_conf_file = os.path.join(bitcoin_dir, 'bitcoin.conf')
         write_config(btc_conf_file, BITCOIND_CONFIG)
         self.rpc = SimpleBitcoinProxy(btc_conf_file=btc_conf_file)
 

Original file line number	Diff line number	Diff line change
`@@ -241,8 +241,7 @@ def __init__(self, bitcoin_dir="/tmp/bitcoind-test", rpcport=None):`
`241`	`241`	`'-nolisten',`
`242`	`242`	`]`
`243`	`243`	`BITCOIND_CONFIG['rpcport'] = rpcport`
`244`		`- btc_conf_file = os.path.join(regtestdir, 'bitcoin.conf')`
`245`		`- write_config(os.path.join(bitcoin_dir, 'bitcoin.conf'), BITCOIND_CONFIG)`
	`244`	`+ btc_conf_file = os.path.join(bitcoin_dir, 'bitcoin.conf')`
`246`	`245`	`write_config(btc_conf_file, BITCOIND_CONFIG)`
`247`	`246`	`self.rpc = SimpleBitcoinProxy(btc_conf_file=btc_conf_file)`
`248`	`247`