ClearML/wexpect-venv
1
0
Fork 0
mirror of https://github.com/clearml/wexpect-venv synced 2025-03-13 06:58:10 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[FIX] workaround for #14 and #3

Browse Source
This commit is contained in:
Benedek Racz 2019-11-14 12:45:10 +01:00
parent 3484a98cdc
commit c1e81b3a69
1 changed files with 28 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
wexpect.py
View File

@ -1943,6 +1943,7 @@ class Wtty:
self.__otid = 0 self.__otid = 0
self.__switch = True self.__switch = True
self.__childProcess = None self.__childProcess = None
self.__conProcess = None
self.codepage = codepage self.codepage = codepage
self.console = False self.console = False
self.lastRead = 0 self.lastRead = 0
@ -1968,7 +1969,10 @@ class Wtty:
# reached # reached
if childPid: if childPid:
try: try:
self.__childProcess = win32api.OpenProcess(win32con.PROCESS_TERMINATE | win32con.PROCESS_QUERY_INFORMATION, False, childPid) self.__childProcess = win32api.OpenProcess(
win32con.PROCESS_TERMINATE | win32con.PROCESS_QUERY_INFORMATION, False, childPid)
self.__conProcess = win32api.OpenProcess(
win32con.PROCESS_TERMINATE | win32con.PROCESS_QUERY_INFORMATION, False, self.conpid)
except pywintypes.error as e: except pywintypes.error as e:
if time.time() > ts + self.timeout: if time.time() > ts + self.timeout:
break break
@ -2057,10 +2061,16 @@ class Wtty:
if not self.__switch: if not self.__switch:
return return
if attatched:
win32console.FreeConsole()
try: try:
# No 'attached' check is needed, FreeConsole() can be called multiple times.
win32console.FreeConsole()
# This is the workaround for #14. The #14 will still occure if the child process
# finishes between this `isalive()` check and `AttachConsole(self.conpid)`. (However the
# risk is low.)
if not self.isalive(console=True):
# When child has finished...
raise EOF('End Of File (EOF) in switchTo().')
win32console.AttachConsole(self.conpid) win32console.AttachConsole(self.conpid)
self.__consin = win32console.GetStdHandle(win32console.STD_INPUT_HANDLE) self.__consin = win32console.GetStdHandle(win32console.STD_INPUT_HANDLE)
self.__consout = self.getConsoleOut() self.__consout = self.getConsoleOut()
@ -2308,9 +2318,9 @@ class Wtty:
waits timeout seconds, and writes the string 'None' waits timeout seconds, and writes the string 'None'
to the pipe if no data is available after that time.""" to the pipe if no data is available after that time."""
self.switchTo()
try: try:
self.switchTo()
while True: while True:
#Wait for child process to be paused #Wait for child process to be paused
if self.__currentReadCo.Y > maxconsoleY: if self.__currentReadCo.Y > maxconsoleY:
@ -2323,25 +2333,21 @@ class Wtty:
self.refreshConsole() self.refreshConsole()
if len(s) != 0: if len(s) != 0:
self.switchBack()
return s return s
if not self.isalive() or timeout <= 0: if not self.isalive() or timeout <= 0:
self.switchBack()
return '' return ''
time.sleep(0.001) time.sleep(0.001)
end = time.time() end = time.time()
timeout -= end - start timeout -= end - start
except Exception as e: except EOF as e:
# This exception seems faulty EOF exception. return ''
logger.info('Unknown Exception!!!') finally:
self.switchBack() self.switchBack()
raise e
self.switchBack() raise Exception('Unreachable code...')
return s
def refreshConsole(self): def refreshConsole(self):
@ -2439,10 +2445,13 @@ class Wtty:
raise raise
self.switchBack() self.switchBack()
def isalive(self): def isalive(self, console=False):
"""True if the child is still alive, false otherwise""" """True if the child is still alive, false otherwise"""
return win32process.GetExitCodeProcess(self.__childProcess) == win32con.STILL_ACTIVE if console:
return win32process.GetExitCodeProcess(self.__conProcess) == win32con.STILL_ACTIVE
else:
return win32process.GetExitCodeProcess(self.__childProcess) == win32con.STILL_ACTIVE
###Broken### ###Broken###
def sendintr(self): def sendintr(self):
@ -2536,6 +2545,7 @@ class ConsoleReader: # pragma: no cover
log(e, 'consolereader', logdir) log(e, 'consolereader', logdir)
time.sleep(.1) time.sleep(.1)
def handler(self, sig): def handler(self, sig):
log(sig, 'consolereader', logdir) log(sig, 'consolereader', logdir)
return False return False