[themotte/rDrama#301] Tests now provide real-time feedback
This commit is contained in:
parent
65a68c214c
commit
5d349deab2
1 changed files with 42 additions and 7 deletions
|
@ -2,22 +2,54 @@ import sys, subprocess, time
|
||||||
|
|
||||||
def _execute(command,**kwargs):
|
def _execute(command,**kwargs):
|
||||||
check = kwargs.get('check',False)
|
check = kwargs.get('check',False)
|
||||||
return subprocess.run(
|
on_stdout_line = kwargs.get('on_stdout_line', None)
|
||||||
|
on_stderr_line = kwargs.get('on_stderr_line', None)
|
||||||
|
with subprocess.Popen(
|
||||||
command,
|
command,
|
||||||
check = check,
|
|
||||||
universal_newlines=True,
|
universal_newlines=True,
|
||||||
stdout=subprocess.PIPE,
|
stdout=subprocess.PIPE,
|
||||||
stderr=subprocess.STDOUT,
|
stderr=subprocess.STDOUT,
|
||||||
)
|
) as proc:
|
||||||
|
stdout = None
|
||||||
|
if proc.stdout:
|
||||||
|
stdout = ''
|
||||||
|
for line in proc.stdout:
|
||||||
|
if on_stdout_line:
|
||||||
|
on_stdout_line(line)
|
||||||
|
stdout += line
|
||||||
|
|
||||||
def _docker(command):
|
stderr = None
|
||||||
|
if proc.stderr:
|
||||||
|
stderr = ''
|
||||||
|
for line in proc.stderr:
|
||||||
|
if on_stderr_line:
|
||||||
|
on_stderr_line(line)
|
||||||
|
stderr += line
|
||||||
|
|
||||||
|
proc.wait()
|
||||||
|
if check and proc.returncode != 0:
|
||||||
|
raise subprocess.CalledProcessError(
|
||||||
|
command,
|
||||||
|
proc.returncode,
|
||||||
|
stdout or None,
|
||||||
|
stderr or None
|
||||||
|
)
|
||||||
|
else:
|
||||||
|
return subprocess.CompletedProcess(
|
||||||
|
command,
|
||||||
|
proc.returncode,
|
||||||
|
stdout or None,
|
||||||
|
stderr or None
|
||||||
|
)
|
||||||
|
|
||||||
|
def _docker(command, **kwargs):
|
||||||
return _execute([
|
return _execute([
|
||||||
"docker-compose",
|
"docker-compose",
|
||||||
"exec", '-T',
|
"exec", '-T',
|
||||||
"files",
|
"files",
|
||||||
"bash", "-c",
|
"bash", "-c",
|
||||||
' && '.join(command)
|
' && '.join(command)
|
||||||
])
|
], **kwargs)
|
||||||
|
|
||||||
def _running():
|
def _running():
|
||||||
command = ['docker','container','inspect','-f','{{.State.Status}}','themotte']
|
command = ['docker','container','inspect','-f','{{.State.Status}}','themotte']
|
||||||
|
@ -46,8 +78,11 @@ def _operation(name, command):
|
||||||
|
|
||||||
# run operation in docker container
|
# run operation in docker container
|
||||||
print(f"Running {name} . . .")
|
print(f"Running {name} . . .")
|
||||||
result = _docker(command)
|
result = _docker(
|
||||||
print(result.stdout)
|
command,
|
||||||
|
on_stdout_line=lambda line: print(line, end=''),
|
||||||
|
on_stderr=lambda line: print(line, end=''),
|
||||||
|
)
|
||||||
|
|
||||||
if not running:
|
if not running:
|
||||||
print("Stopping containers...")
|
print("Stopping containers...")
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue