Merge #8840: test: Explicitly set encoding to utf8 when opening text files

30930e8 test: Explicitly set encoding to utf8 when opening text files (Wladimir J. van der Laan)
This commit is contained in:
Wladimir J. van der Laan 2016-09-30 12:34:37 +02:00
commit 929860106f
No known key found for this signature in database
GPG Key ID: 74810B012346C9A6
7 changed files with 12 additions and 12 deletions

View File

@ -22,7 +22,7 @@ class ForkNotifyTest(BitcoinTestFramework):
def setup_network(self): def setup_network(self):
self.nodes = [] self.nodes = []
self.alert_filename = os.path.join(self.options.tmpdir, "alert.txt") self.alert_filename = os.path.join(self.options.tmpdir, "alert.txt")
with open(self.alert_filename, 'w') as f: with open(self.alert_filename, 'w', encoding='utf8') as f:
pass # Just open then close to create zero-length file pass # Just open then close to create zero-length file
self.nodes.append(start_node(0, self.options.tmpdir, self.nodes.append(start_node(0, self.options.tmpdir,
["-blockversion=2", "-alertnotify=echo %s >> \"" + self.alert_filename + "\""])) ["-blockversion=2", "-alertnotify=echo %s >> \"" + self.alert_filename + "\""]))
@ -44,7 +44,7 @@ class ForkNotifyTest(BitcoinTestFramework):
self.nodes[1].generate(1) self.nodes[1].generate(1)
self.sync_all() self.sync_all()
with open(self.alert_filename, 'r') as f: with open(self.alert_filename, 'r', encoding='utf8') as f:
alert_text = f.read() alert_text = f.read()
if len(alert_text) == 0: if len(alert_text) == 0:
@ -56,7 +56,7 @@ class ForkNotifyTest(BitcoinTestFramework):
self.nodes[1].generate(1) self.nodes[1].generate(1)
self.sync_all() self.sync_all()
with open(self.alert_filename, 'r') as f: with open(self.alert_filename, 'r', encoding='utf8') as f:
alert_text2 = f.read() alert_text2 = f.read()
if alert_text != alert_text2: if alert_text != alert_text2:

View File

@ -26,7 +26,7 @@ class HTTPBasicsTest (BitcoinTestFramework):
#Append rpcauth to bitcoin.conf before initialization #Append rpcauth to bitcoin.conf before initialization
rpcauth = "rpcauth=rt:93648e835a54c573682c2eb19f882535$7681e9c5b74bdd85e78166031d2058e1069b3ed7ed967c93fc63abba06f31144" rpcauth = "rpcauth=rt:93648e835a54c573682c2eb19f882535$7681e9c5b74bdd85e78166031d2058e1069b3ed7ed967c93fc63abba06f31144"
rpcauth2 = "rpcauth=rt2:f8607b1a88861fac29dfccf9b52ff9f$ff36a0c23c8c62b4846112e50fa888416e94c17bfd4c42f88fd8f55ec6a3137e" rpcauth2 = "rpcauth=rt2:f8607b1a88861fac29dfccf9b52ff9f$ff36a0c23c8c62b4846112e50fa888416e94c17bfd4c42f88fd8f55ec6a3137e"
with open(os.path.join(self.options.tmpdir+"/node0", "bitcoin.conf"), 'a') as f: with open(os.path.join(self.options.tmpdir+"/node0", "bitcoin.conf"), 'a', encoding='utf8') as f:
f.write(rpcauth+"\n") f.write(rpcauth+"\n")
f.write(rpcauth2+"\n") f.write(rpcauth2+"\n")

View File

@ -72,7 +72,7 @@ class VersionBitsWarningTest(BitcoinTestFramework):
def setup_network(self): def setup_network(self):
self.alert_filename = os.path.join(self.options.tmpdir, "alert.txt") self.alert_filename = os.path.join(self.options.tmpdir, "alert.txt")
# Open and close to create zero-length file # Open and close to create zero-length file
with open(self.alert_filename, 'w') as _: with open(self.alert_filename, 'w', encoding='utf8') as _:
pass pass
self.extra_args = [["-debug", "-logtimemicros=1", "-alertnotify=echo %s >> \"" + self.alert_filename + "\""]] self.extra_args = [["-debug", "-logtimemicros=1", "-alertnotify=echo %s >> \"" + self.alert_filename + "\""]]
self.nodes = start_nodes(self.num_nodes, self.options.tmpdir, self.extra_args) self.nodes = start_nodes(self.num_nodes, self.options.tmpdir, self.extra_args)
@ -95,7 +95,7 @@ class VersionBitsWarningTest(BitcoinTestFramework):
peer.sync_with_ping() peer.sync_with_ping()
def test_versionbits_in_alert_file(self): def test_versionbits_in_alert_file(self):
with open(self.alert_filename, 'r') as f: with open(self.alert_filename, 'r', encoding='utf8') as f:
alert_text = f.read() alert_text = f.read()
assert(VB_PATTERN.match(alert_text)) assert(VB_PATTERN.match(alert_text))
@ -147,7 +147,7 @@ class VersionBitsWarningTest(BitcoinTestFramework):
stop_node(self.nodes[0], 0) stop_node(self.nodes[0], 0)
wait_bitcoinds() wait_bitcoinds()
# Empty out the alert file # Empty out the alert file
with open(self.alert_filename, 'w') as _: with open(self.alert_filename, 'w', encoding='utf8') as _:
pass pass
self.nodes = start_nodes(self.num_nodes, self.options.tmpdir, self.extra_args) self.nodes = start_nodes(self.num_nodes, self.options.tmpdir, self.extra_args)

View File

@ -50,7 +50,7 @@ class AuthServiceProxyWrapper(object):
rpc_method = self.auth_service_proxy_instance._service_name rpc_method = self.auth_service_proxy_instance._service_name
if self.coverage_logfile: if self.coverage_logfile:
with open(self.coverage_logfile, 'a+') as f: with open(self.coverage_logfile, 'a+', encoding='utf8') as f:
f.write("%s\n" % rpc_method) f.write("%s\n" % rpc_method)
return return_val return return_val
@ -100,7 +100,7 @@ def write_all_rpc_commands(dirname, node):
if line and not line.startswith('='): if line and not line.startswith('='):
commands.add("%s\n" % line.split()[0]) commands.add("%s\n" % line.split()[0])
with open(filename, 'w') as f: with open(filename, 'w', encoding='utf8') as f:
f.writelines(list(commands)) f.writelines(list(commands))
return True return True

View File

@ -58,7 +58,7 @@ def netstat(typ='tcp'):
To get pid of all network process running on system, you must run this script To get pid of all network process running on system, you must run this script
as superuser as superuser
''' '''
with open('/proc/net/'+typ,'r') as f: with open('/proc/net/'+typ,'r',encoding='utf8') as f:
content = f.readlines() content = f.readlines()
content.pop(0) content.pop(0)
result = [] result = []

View File

@ -161,7 +161,7 @@ def initialize_datadir(dirname, n):
if not os.path.isdir(datadir): if not os.path.isdir(datadir):
os.makedirs(datadir) os.makedirs(datadir)
rpc_u, rpc_p = rpc_auth_pair(n) rpc_u, rpc_p = rpc_auth_pair(n)
with open(os.path.join(datadir, "bitcoin.conf"), 'w') as f: with open(os.path.join(datadir, "bitcoin.conf"), 'w', encoding='utf8') as f:
f.write("regtest=1\n") f.write("regtest=1\n")
f.write("rpcuser=" + rpc_u + "\n") f.write("rpcuser=" + rpc_u + "\n")
f.write("rpcpassword=" + rpc_p + "\n") f.write("rpcpassword=" + rpc_p + "\n")

View File

@ -12,7 +12,7 @@ def read_dump(file_name, addrs, hd_master_addr_old):
Read the given dump, count the addrs that match, count change and reserve. Read the given dump, count the addrs that match, count change and reserve.
Also check that the old hd_master is inactive Also check that the old hd_master is inactive
""" """
with open(file_name) as inputfile: with open(file_name, encoding='utf8') as inputfile:
found_addr = 0 found_addr = 0
found_addr_chg = 0 found_addr_chg = 0
found_addr_rsv = 0 found_addr_rsv = 0