summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Klozik <martinx.klozik@intel.com>2018-01-22 11:23:41 +0000
committerMartin Klozik <martinx.klozik@intel.com>2018-01-22 11:23:41 +0000
commit52c154c463705b51c54d639026093ecd80c9a6b4 (patch)
treecf6011b428bcd46f2528d4ede8f9ccaf436eb90f
parentc870b4c5e4360008e17dda745fc9ce11b212f702 (diff)
bugfix: Define _EXECUTED_PIDS in config file
Add definition of internal _EXECUTED_PIDS list into generic configuration file. JIRA: VSPERF-556 Change-Id: I6c237cb563c0a37bf806561d1f841587796399b8 Signed-off-by: Martin Klozik <martinx.klozik@intel.com>
-rw-r--r--conf/00_common.conf3
-rw-r--r--tools/tasks.py7
2 files changed, 5 insertions, 5 deletions
diff --git a/conf/00_common.conf b/conf/00_common.conf
index 4c25b0b8..279c67b4 100644
--- a/conf/00_common.conf
+++ b/conf/00_common.conf
@@ -90,6 +90,9 @@ PATHS = {}
# shell command to use when running commands through Pexpect
SHELL_CMD = ['/bin/bash', '-c']
+# internal list to keep track of PIDs of jobs executed by vsperf
+_EXECUTED_PIDS = []
+
# ############################
# Logging configuration
# ############################
diff --git a/tools/tasks.py b/tools/tasks.py
index 18f4d712..4e03f85e 100644
--- a/tools/tasks.py
+++ b/tools/tasks.py
@@ -117,11 +117,8 @@ def run_task(cmd, logger, msg=None, check_error=False):
def update_pids(pid):
"""update list of running pids, so they can be terminated at the end
"""
- try:
- pids = settings.getValue('_EXECUTED_PIDS')
- pids.append(pid)
- except AttributeError:
- pids = [pid]
+ pids = settings.getValue('_EXECUTED_PIDS')
+ pids.append(pid)
settings.setValue('_EXECUTED_PIDS', pids)
def run_background_task(cmd, logger, msg):