aboutsummaryrefslogtreecommitdiff
path: root/bart/sched
diff options
context:
space:
mode:
authorJavi Merino <merino.jav@gmail.com>2015-11-11 17:44:46 +0000
committerJavi Merino <merino.jav@gmail.com>2015-11-11 17:44:46 +0000
commit9462f889b30858afe766ccf33727714ea3676d93 (patch)
treebca57db409b6d877e5fb481dba806ff079392cc2 /bart/sched
parent61bc84a2435770fc4ec86986c32f0ad775a5e34d (diff)
parentc9211760aa45c463a384c8f90c206d091dfa7d9f (diff)
downloadbart-9462f889b30858afe766ccf33727714ea3676d93.tar.gz
Merge pull request #27 from sinkap/issue_23_v2
sched: SchedMultiAssert: Add missing pids argument
Diffstat (limited to 'bart/sched')
-rwxr-xr-xbart/sched/SchedMultiAssert.py15
1 files changed, 12 insertions, 3 deletions
diff --git a/bart/sched/SchedMultiAssert.py b/bart/sched/SchedMultiAssert.py
index e949d2c..2792079 100755
--- a/bart/sched/SchedMultiAssert.py
+++ b/bart/sched/SchedMultiAssert.py
@@ -136,12 +136,21 @@ class SchedMultiAssert(object):
functionality
"""
- def __init__(self, run, topology, execnames):
+ def __init__(self, run, topology, execnames=None, pids=None):
- self._execnames = listify(execnames)
self._run = Utils.init_run(run)
- self._pids = self._populate_pids()
self._topology = topology
+
+ if execnames and pids:
+ raise ValueError('Either pids or execnames must be specified')
+ if execnames:
+ self._execnames = listify(execnames)
+ self._pids = self._populate_pids()
+ elif pids:
+ self._pids = pids
+ else:
+ raise ValueError('One of PIDs or execnames must be specified')
+
self._asserts = self._populate_asserts()
self._populate_methods()