aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcoFalke <falke.marco@gmail.com>2017-07-07 13:28:44 +0200
committerMarcoFalke <falke.marco@gmail.com>2017-07-07 13:28:47 +0200
commit1d4805ce04645f3203b0cfd3d66ea710e7433eb4 (patch)
treed4b2753c8867278c7e8703e8dfc6e9fa03fccf0c
parentd3b58704d1d325875fc605580c1c02b825c1bbcc (diff)
parentbc7d1032f8bcf7d5fc807ec0df6fe76410732d97 (diff)
Merge #10759: Fix multi_rpc test for hosts that dont default to utf8
bc7d103 Fix multi_rpc test for hosts that dont default to utf8 (Matt Corallo) Tree-SHA512: 7644b1f50d4010a08aed5d1c87ab7326af9c109ac05dfbfc4bb6d5a19ace7997ef9cdd64d4301072f1106225de6d3aacccb17f53043b55ba61f5723c2b65af30
-rw-r--r--test/functional/test_framework/util.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/test/functional/test_framework/util.py b/test/functional/test_framework/util.py
index 8a2d8de50e..acca72aa86 100644
--- a/test/functional/test_framework/util.py
+++ b/test/functional/test_framework/util.py
@@ -236,7 +236,7 @@ def get_auth_cookie(datadir, n):
user = None
password = None
if os.path.isfile(os.path.join(datadir, "bitcoin.conf")):
- with open(os.path.join(datadir, "bitcoin.conf"), 'r') as f:
+ with open(os.path.join(datadir, "bitcoin.conf"), 'r', encoding='utf8') as f:
for line in f:
if line.startswith("rpcuser="):
assert user is None # Ensure that there is only one rpcuser line