summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Loehning <robert.loehning@qt.io>2016-05-30 17:59:11 +0200
committerRobert Loehning <robert.loehning@qt.io>2016-05-31 09:15:35 +0000
commit7d51d3849abeb3adaaeed9988694a38d7008a848 (patch)
treeb8cfedd85cbb8679683a6c8f2e0fbb3461f510ec
parent7eca0803d94f4a14107432cd10886e92fbceffa7 (diff)
downloadqt-creator-7d51d3849abeb3adaaeed9988694a38d7008a848.tar.gz
Squish: Silence more warnings
Change-Id: I6259382a2359a795654a6d6536112c090ede130f Reviewed-by: Christian Stenger <christian.stenger@qt.io>
-rw-r--r--tests/system/shared/qtcreator.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/tests/system/shared/qtcreator.py b/tests/system/shared/qtcreator.py
index 265fa10107..b33d5f6170 100644
--- a/tests/system/shared/qtcreator.py
+++ b/tests/system/shared/qtcreator.py
@@ -118,7 +118,8 @@ def waitForCleanShutdown(timeOut=10):
if not shutdownDone and datetime.utcnow() > endtime:
break
if platform.system() == 'Linux' and JIRA.isBugStillOpen(15749):
- pgrepOutput = getOutputFromCmdline(["pgrep", "-f", "qtcreator_process_stub"])
+ pgrepOutput = getOutputFromCmdline(["pgrep", "-f", "qtcreator_process_stub"],
+ acceptedError=1)
pids = pgrepOutput.splitlines()
if len(pids):
print("Killing %d qtcreator_process_stub instances" % len(pids))