xxq250
/
homework-jianmu
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Adjusted crash_gen tool to tolerate non UTF8 server output

This commit is contained in:
Steven Li 2020-08-27 04:47:43 +00:00
parent 43bbbfd866
commit 2b74699d35
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tests/pytest/crash_gen.py
View File

@ -166,7 +166,7 @@ class WorkerThread:
self.useDb() # might encounter exceptions. TODO: catch self.useDb() # might encounter exceptions. TODO: catch
except taos.error.ProgrammingError as err: except taos.error.ProgrammingError as err:
errno = Helper.convertErrno(err.errno) errno = Helper.convertErrno(err.errno)
if errno == 0x383 : # invalid database if errno in [0x383, 0x386, 0x00B, 0x014] : # invalid database, dropping, Unable to establish connection, Database not ready
# ignore # ignore
dummy = 0 dummy = 0
else: else:
@ -2442,7 +2442,11 @@ class ServiceManagerThread:
for line in iter(out.readline, b''): for line in iter(out.readline, b''):
# print("Finished reading a line: {}".format(line)) # print("Finished reading a line: {}".format(line))
# print("Adding item to queue...") # print("Adding item to queue...")
line = line.decode("utf-8").rstrip() try:
line = line.decode("utf-8").rstrip()
except UnicodeError:
print("\nNon-UTF8 server output: {}\n".format(line))
# This might block, and then causing "out" buffer to block # This might block, and then causing "out" buffer to block
queue.put(line) queue.put(line)
self._printProgress("_i") self._printProgress("_i")