summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorDavid Lamparter <equinox@opensourcerouting.org>2017-07-11 14:53:31 +0200
committerDavid Lamparter <equinox@opensourcerouting.org>2017-07-11 15:00:26 +0200
commit2e8a2df1fbd4c1d7ee7035dff6484ec5d093c5f1 (patch)
tree454aa528f45f4fb15b82e22efbc786824b942469 /tests
parentospf6d: use macro for LSDB walks (diff)
downloadfrr-2e8a2df1fbd4c1d7ee7035dff6484ec5d093c5f1.tar.xz
frr-2e8a2df1fbd4c1d7ee7035dff6484ec5d093c5f1.zip
tests: fix pytest API "surprise" in skipping tests
pytest.mark.skipif apparently iterates through a class's methods, applying itself onto the various methods. Now, since we're deriving from a parent class, the method is actually the same object inherited from the parent, so the decorator will apply itself on the parent's testrunning method (test_refout). The result is that any TestRefout tests after "test_commands.py" will be skipped... This only became apparent after adding ospf6d/test_lsdb.py; before, test_commands.py was the last test in the list so it didn't matter... Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
Diffstat (limited to 'tests')
-rw-r--r--tests/lib/cli/test_commands.py7
1 files changed, 5 insertions, 2 deletions
diff --git a/tests/lib/cli/test_commands.py b/tests/lib/cli/test_commands.py
index 85e34fa15..bda0bbac4 100644
--- a/tests/lib/cli/test_commands.py
+++ b/tests/lib/cli/test_commands.py
@@ -2,7 +2,10 @@ import frrtest
import pytest
import os
-@pytest.mark.skipif('QUAGGA_TEST_COMMANDS' not in os.environ,
- reason='QUAGGA_TEST_COMMANDS not set')
class TestCommands(frrtest.TestRefOut):
program = './test_commands'
+
+ @pytest.mark.skipif('QUAGGA_TEST_COMMANDS' not in os.environ,
+ reason='QUAGGA_TEST_COMMANDS not set')
+ def test_refout(self):
+ return super(TestCommands, self).test_refout(self)