summaryrefslogtreecommitdiffstats
path: root/meta/lib/oeqa/utils/commands.py
diff options
context:
space:
mode:
Diffstat (limited to 'meta/lib/oeqa/utils/commands.py')
-rw-r--r--meta/lib/oeqa/utils/commands.py7
1 files changed, 5 insertions, 2 deletions
diff --git a/meta/lib/oeqa/utils/commands.py b/meta/lib/oeqa/utils/commands.py
index 8059cbce3e..a71c16ab14 100644
--- a/meta/lib/oeqa/utils/commands.py
+++ b/meta/lib/oeqa/utils/commands.py
@@ -125,11 +125,11 @@ class Command(object):
125 125
126 def stop(self): 126 def stop(self):
127 for thread in self.threads: 127 for thread in self.threads:
128 if thread.isAlive(): 128 if thread.is_alive():
129 self.process.terminate() 129 self.process.terminate()
130 # let's give it more time to terminate gracefully before killing it 130 # let's give it more time to terminate gracefully before killing it
131 thread.join(5) 131 thread.join(5)
132 if thread.isAlive(): 132 if thread.is_alive():
133 self.process.kill() 133 self.process.kill()
134 thread.join() 134 thread.join()
135 135
@@ -188,7 +188,10 @@ def runCmd(command, ignore_status=False, timeout=None, assert_error=True, sync=T
188 # call sync around the tests to ensure the IO queue doesn't get too large, taking any IO 188 # call sync around the tests to ensure the IO queue doesn't get too large, taking any IO
189 # hit here rather than in bitbake shutdown. 189 # hit here rather than in bitbake shutdown.
190 if sync: 190 if sync:
191 p = os.environ['PATH']
192 os.environ['PATH'] = "/usr/bin:/bin:/usr/sbin:/sbin:" + p
191 os.system("sync") 193 os.system("sync")
194 os.environ['PATH'] = p
192 195
193 result.command = command 196 result.command = command
194 result.status = cmd.status 197 result.status = cmd.status