Mirrors/go-chasquid-smtp
1
0
Fork 0
mirror of https://blitiri.com.ar/repos/chasquid synced 2025-12-20 15:07:03 +00:00
Code Releases Activity

test: Make "chamuyero" work in utf8 regardless of the environment

Browse Source 
Our chamuyero tests involve reading and writing utf8. This usually
works, but is dependent on the environment: on LC_ALL=POSIX environment,
for example, Python enforces ascii as the default encoding, and the
tests break.

So this patch makes chamuyero explicitly set utf8 encodings in stdout
and all the sockets.
This commit is contained in:
Alberto Bertogli
2018-03-26 00:44:44 +01:00
parent b0011f5a51
commit 1b28734e44
1 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
test/util/chamuyero
View File

@@ -21,9 +21,13 @@ import time
# Command-line flags. # Command-line flags.
ap = argparse.ArgumentParser() ap = argparse.ArgumentParser()
ap.add_argument("script", type=argparse.FileType('r', encoding='UTF-8')) ap.add_argument("script", type=argparse.FileType('r', encoding='utf8'))
args = ap.parse_args() args = ap.parse_args()
# Make sure stdout is open in utf8 mode, as we will print our input, which is
# utf8, and want it to work regardless of the environment.
sys.stdout = open(sys.stdout.fileno(), mode='w', encoding='utf8', buffering=1)
class Process (object): class Process (object):
def __init__(self, cmd, **kwargs): def __init__(self, cmd, **kwargs):
@@ -60,8 +64,8 @@ class Sock (object):
def _accept(self): def _accept(self):
conn, _ = self.sock.accept() conn, _ = self.sock.accept()
self.connr = conn.makefile(mode="r") self.connr = conn.makefile(mode="r", encoding="utf8")
self.connw = conn.makefile(mode="w") self.connw = conn.makefile(mode="w", encoding="utf8")
self.has_conn.set() self.has_conn.set()
def write(self, s): def write(self, s):
@@ -93,8 +97,8 @@ class TCPSock (Sock):
def connect(self): def connect(self):
self.sock = socket.create_connection(self.addr) self.sock = socket.create_connection(self.addr)
self.connr = self.sock.makefile(mode="r") self.connr = self.sock.makefile(mode="r", encoding="utf8")
self.connw = self.sock.makefile(mode="w") self.connw = self.sock.makefile(mode="w", encoding="utf8")
self.has_conn.set() self.has_conn.set()
@@ -106,8 +110,8 @@ class TLSSock (Sock):
self.sock = ssl.wrap_socket(plain_sock) self.sock = ssl.wrap_socket(plain_sock)
def connect(self): def connect(self):
self.connr = self.sock.makefile(mode="r") self.connr = self.sock.makefile(mode="r", encoding="utf8")
self.connw = self.sock.makefile(mode="w") self.connw = self.sock.makefile(mode="w", encoding="utf8")
self.has_conn.set() self.has_conn.set()