tsarevvv/nmstate
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tests integ: Refactor fixture setup of ethX interfaces

Browse Source 
The ethX fixtures prepare the base interfaces per test by initializing
their configuration (performing a down-up action).

The existing flow has been initializing the interfaces before a test is
executed with no action taken when it ends. This causes leftovers when
testing bonds/bridges with slaves/ports, affecting the following tests.

In order to resolve the post test leftovers, adjust the test fixtures
to setup the interface at the test setup and to remove them
(set them `down`) at the test teardown.
In order to treat the initial state of the tests session execution,
where the interfaces may have an unknown state/configuration, use a
session-scoped fixture to initialize them (by setting them `down`).

Signed-off-by: Edward Haas <edwardh@redhat.com>
This commit is contained in:
Edward Haas 2019-05-15 21:08:08 +03:00
parent 12593df0e7
commit aea3286f8d
1 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
tests/integration/conftest.py
View File

@ -1,5 +1,5 @@
#
# Copyright 2018 Red Hat, Inc.
# Copyright 2018-2019 Red Hat, Inc.
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@ -32,30 +32,35 @@ def logging_setup():
level=logging.DEBUG)
@pytest.fixture(scope='function')
def eth1_down():
@pytest.fixture(scope='session', autouse=True)
def ethx_init():
""" Remove any existing definitions on the ethX interfaces. """
_set_eth_admin_state('eth1', 'down')
@pytest.fixture(scope='function')
def eth2_down():
_set_eth_admin_state('eth2', 'down')
@pytest.fixture(scope='function')
def eth1_up(eth1_down):
def eth1_up():
_set_eth_admin_state('eth1', 'up')
try:
yield
finally:
_set_eth_admin_state('eth1', 'down')
@pytest.fixture(scope='function')
def eth2_up(eth2_down):
def eth2_up():
_set_eth_admin_state('eth2', 'up')
try:
yield
finally:
_set_eth_admin_state('eth2', 'down')
def _set_eth_admin_state(ifname, state):
current_state = statelib.show_only((ifname,))
iface_current_state, = current_state[INTERFACES]
if iface_current_state['state'] != state:
if iface_current_state['state'] != state or state == 'down':
desired_state = {INTERFACES: [{'name': iface_current_state['name'],
'type': iface_current_state['type'],
'state': state}]}