mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-29 19:50:40 +00:00
Code Issues 1 Projects Releases Wiki Activity

validate: launcher: Don't wait for processes longer than necessary

Browse source
This commit is contained in:
Ramiro Polla 2015-01-12 13:09:33 +01:00 committed by Thibault Saunier
parent db695185c9
commit bdedd7abb9
1 changed files with 19 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
validate/launcher/baseclasses.py
View file

@ -28,6 +28,7 @@ import utils
import signal
import urlparse
import subprocess
import threading
import reporters
import ConfigParser
import loggable
@ -59,6 +60,8 @@ class Test(Loggable):
self.command = ""
self.reporter = reporter
self.process = None
self.proc_env = None
self.thread = None
self.duration = duration
self.clean()
@ -167,14 +170,13 @@ class Test(Loggable):
last_change_ts = time.time()
start_ts = time.time()
while True:
# Check process every second for timeout
self.thread.join(1.0)
self.process.poll()
if self.process.returncode is not None:
break
# Dirty way to avoid eating to much CPU...
# good enough for us anyway.
time.sleep(1)
val = self.get_current_value()
self.debug("Got value: %s" % val)
@ -231,11 +233,19 @@ class Test(Loggable):
% DEFAULT_TIMEOUT)
res = self.process.poll()
def thread_wrapper(self):
self.process = subprocess.Popen("exec " + self.command,
stderr=self.reporter.out,
stdout=self.reporter.out,
shell=True,
env=self.proc_env)
self.process.wait()
def run(self):
self.command = "%s " % (self.application)
self._starting_time = time.time()
self.build_arguments()
proc_env = self.get_subproc_env()
self.proc_env = self.get_subproc_env()
message = "Launching: %s%s\n" \
" Command: '%s %s'\n" % (Colors.ENDC, self.classname,
@ -255,18 +265,17 @@ class Test(Loggable):
printc(message, Colors.OKBLUE)
self.thread = threading.Thread(target=self.thread_wrapper)
self.thread.start()
try:
self.process = subprocess.Popen("exec " + self.command,
stderr=self.reporter.out,
stdout=self.reporter.out,
shell=True,
env=proc_env)
self.wait_process()
except KeyboardInterrupt:
self._kill_subprocess()
raise
self._kill_subprocess()
self.thread.join()
self.time_taken = time.time() - self._starting_time
printc("Result: %s%s\n" % (self.result,