RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-03-06 08:20:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

vstart_runner: reuse code in LocalRemoteProcess

Browse Source 
Reduce duplication in LocalRemoteProcess.wait() and
LocalRemoteProcess.finished() by moving the common code to a separate
method and then using that separate method instead.

Signed-off-by: Rishabh Dave <ridave@redhat.com>
This commit is contained in:
Rishabh Dave 2020-12-08 14:10:43 +05:30
parent e05959de8d
commit dbe002ef64
1 changed files with 22 additions and 24 deletions

46
qa/tasks/vstart_runner.py
View File

@ -182,6 +182,22 @@ class LocalRemoteProcess(object):
self.check_status = check_status
self.exitstatus = self.returncode = None
def _write_stdout(self, out):
if isinstance(self.stdout, StringIO):
self.stdout.write(out.decode(errors='ignore'))
elif self.stdout is None:
pass
else:
self.stdout.write(out)
def _write_stderr(self, err):
if isinstance(self.stderr, StringIO):
self.stderr.write(err.decode(errors='ignore'))
elif self.stderr is None:
pass
else:
self.stderr.write(err)
def wait(self):
if self.finished:
# Avoid calling communicate() on a dead process because it'll
@ -193,18 +209,8 @@ class LocalRemoteProcess(object):
out, err = self.subproc.communicate()
out, err = rm_nonascii_chars(out), rm_nonascii_chars(err)
if isinstance(self.stdout, StringIO):
self.stdout.write(out.decode(errors='ignore'))
elif self.stdout is None:
pass
else:
self.stdout.write(out)
if isinstance(self.stderr, StringIO):
self.stderr.write(err.decode(errors='ignore'))
elif self.stderr is None:
pass
else:
self.stderr.write(err)
self._write_stdout(out)
self._write_stderr(err)
self.exitstatus = self.returncode = self.subproc.returncode
@ -222,19 +228,11 @@ class LocalRemoteProcess(object):
if self.subproc.poll() is not None:
out, err = self.subproc.communicate()
if isinstance(self.stdout, StringIO):
self.stdout.write(out.decode(errors='ignore'))
elif self.stdout is None:
pass
else:
self.stdout.write(out)
if isinstance(self.stderr, StringIO):
self.stderr.write(err.decode(errors='ignore'))
elif self.stderr is None:
pass
else:
self.stderr.write(err)
self._write_stdout(out)
self._write_stderr(err)
self.exitstatus = self.returncode = self.subproc.returncode
return True
else:
return False