matthieu/frr
1
0
Fork 0
forked from Mirror/frr
Code Pull requests Activity

topotest: fix pytest deprecation warning

Browse source 
As of pytest 4.something, a pattern we were using in conftest.py
was deprecated. Also make a new-ish test script executable (all
the rest appear to be?)

Signed-off-by: Mark Stapp <mjs@voltanet.io>
This commit is contained in:
Mark Stapp 2019-05-02 14:43:18 -04:00
parent bcbce7b283
commit 80cb48d2f4
2 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

0
tests/topotests/bgp-vrf-route-leak-basic/test_bgp.py Normal file → Executable file
View file

14
tests/topotests/conftest.py
View file

@ -7,6 +7,8 @@ from lib.topotest import json_cmp_result
from lib.topolog import logger
import pytest
topology_only = False
def pytest_addoption(parser):
"""
Add topology-only option to the topology tester. This option makes pytest
@ -20,9 +22,9 @@ def pytest_runtest_call():
This function must be run after setup_module(), it does standarized post
setup routines. It is only being used for the 'topology-only' option.
"""
# pylint: disable=E1101
# Trust me, 'config' exists.
if pytest.config.getoption('--topology-only'):
global topology_only
if topology_only:
tgen = get_topogen()
if tgen is not None:
# Allow user to play with the setup.
@ -44,9 +46,15 @@ def pytest_assertrepr_compare(op, left, right):
def pytest_configure(config):
"Assert that the environment is correctly configured."
global topology_only
if not diagnose_env():
pytest.exit('enviroment has errors, please read the logs')
if config.getoption('--topology-only'):
topology_only = True
def pytest_runtest_makereport(item, call):
"Log all assert messages to default logger with error level"
# Nothing happened