summaryrefslogtreecommitdiffstats
path: root/tests/helpers
diff options
context:
space:
mode:
authorChristian Franke <chris@opensourcerouting.org>2017-05-08 17:24:30 +0200
committerChristian Franke <chris@opensourcerouting.org>2017-05-08 17:24:30 +0200
commit9d83fa426c6aaa531c567a202d80d7b0707d2e13 (patch)
tree0d9a0ed253186267ab4b8086c838774bba40a768 /tests/helpers
parentMerge pull request #476 from qlyoung/abort-select-fd (diff)
downloadfrr-9d83fa426c6aaa531c567a202d80d7b0707d2e13.tar.xz
frr-9d83fa426c6aaa531c567a202d80d7b0707d2e13.zip
tests: allow to use exit_cleanly as test method
TestMultiOut can now also just check for clean exit Signed-off-by: Christian Franke <chris@opensourcerouting.org>
Diffstat (limited to 'tests/helpers')
-rw-r--r--tests/helpers/python/frrtest.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/tests/helpers/python/frrtest.py b/tests/helpers/python/frrtest.py
index a7ef1c56b..da9e447fc 100644
--- a/tests/helpers/python/frrtest.py
+++ b/tests/helpers/python/frrtest.py
@@ -87,7 +87,8 @@ class _TestMultiOut(object):
def _add_test(cls, method, *args, **kwargs):
if 'tests' not in dir(cls):
setattr(cls,'tests',[])
- cls._add_test(cls._exit_cleanly)
+ if method is not cls._exit_cleanly:
+ cls._add_test(cls._exit_cleanly)
def matchfunction(self):
method(self, *args, **kwargs)