diff options
| author | Russ White <russ@riw.us> | 2021-01-26 07:39:02 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-26 07:39:02 -0500 |
| commit | aee697b4549b0f312a87b2f861f173497ffca72e (patch) | |
| tree | f7afbfcf2205c2014a1c7486fea92806d6931459 /tests/topotests/pim-basic/test_pim.py | |
| parent | 044a7317471de97222d0beeb9b9ef89e35d1b5ea (diff) | |
| parent | 7ed8fcff2b780618f29a74bb660d8d033082e3de (diff) | |
Merge pull request #7901 from donaldsharp/pim_marking
tests: Fix to use global variable for pim marking
Diffstat (limited to 'tests/topotests/pim-basic/test_pim.py')
| -rw-r--r-- | tests/topotests/pim-basic/test_pim.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/tests/topotests/pim-basic/test_pim.py b/tests/topotests/pim-basic/test_pim.py index 74a7fbf16e..224b82f1fb 100644 --- a/tests/topotests/pim-basic/test_pim.py +++ b/tests/topotests/pim-basic/test_pim.py @@ -31,6 +31,8 @@ import pytest import json from functools import partial +pytestmark = pytest.mark.pimd + CWD = os.path.dirname(os.path.realpath(__file__)) sys.path.append(os.path.join(CWD, "../")) @@ -80,7 +82,7 @@ class PIMTopo(Topo): sw.add_link(tgen.gears["r1"]) sw.add_link(tgen.gears["r3"]) -@pytest.mark.pim + def setup_module(mod): "Sets up the pytest environment" tgen = Topogen(PIMTopo, mod.__name__) |