diff options
author | Christian Poessinger <christian@poessinger.com> | 2021-01-26 20:07:21 +0100 |
---|---|---|
committer | Christian Poessinger <christian@poessinger.com> | 2021-01-27 18:51:06 +0000 |
commit | 788f741a0beb9a2dbf52f8c7b9d0b0903ec6a87c (patch) | |
tree | bb546fe276f4c9930360ea74a08203be78b2df1c /smoketest/scripts/cli/test_interfaces_bridge.py | |
parent | fb5a64a0a517291efe62185d053b437b62ef2921 (diff) | |
download | vyos-1x-788f741a0beb9a2dbf52f8c7b9d0b0903ec6a87c.tar.gz vyos-1x-788f741a0beb9a2dbf52f8c7b9d0b0903ec6a87c.zip |
smoketest: refactor setUp() for all interface based testcases
It does not make sense (at all!) to re-initialize the entire class with every
call to setUp(). We neither change the enabled/disabled tastcases dynamically,
not do we adjust the testinterfaces during a run.
Remove the runtime overhead and place one-time init calls into setUpClass()
instead.
(cherry picked from commit b48890396dcff074d1e9336ca1db9d3eafe2a12f)
Diffstat (limited to 'smoketest/scripts/cli/test_interfaces_bridge.py')
-rwxr-xr-x | smoketest/scripts/cli/test_interfaces_bridge.py | 34 |
1 files changed, 16 insertions, 18 deletions
diff --git a/smoketest/scripts/cli/test_interfaces_bridge.py b/smoketest/scripts/cli/test_interfaces_bridge.py index 464226b6f..854d870be 100755 --- a/smoketest/scripts/cli/test_interfaces_bridge.py +++ b/smoketest/scripts/cli/test_interfaces_bridge.py @@ -27,31 +27,29 @@ from vyos.util import cmd from vyos.util import read_file class BridgeInterfaceTest(BasicInterfaceTest.BaseTest): - def setUp(self): - self._test_ip = True - self._test_ipv6 = True - self._test_ipv6_pd = True - self._test_vlan = True - self._test_qinq = True - self._base_path = ['interfaces', 'bridge'] - self._mirror_interfaces = ['dum21354'] - self._members = [] + @classmethod + def setUpClass(cls): + cls._test_ip = True + cls._test_ipv6 = True + cls._test_ipv6_pd = True + cls._test_vlan = True + cls._base_path = ['interfaces', 'bridge'] + cls._mirror_interfaces = ['dum21354'] + cls._members = [] # we need to filter out VLAN interfaces identified by a dot (.) # in their name - just in case! if 'TEST_ETH' in os.environ: - self._members = os.environ['TEST_ETH'].split() + cls._members = os.environ['TEST_ETH'].split() else: - for tmp in Section.interfaces("ethernet"): + for tmp in Section.interfaces('ethernet'): if not '.' in tmp: - self._members.append(tmp) + cls._members.append(tmp) - self._options['br0'] = [] - for member in self._members: - self._options['br0'].append(f'member interface {member}') - self._interfaces = list(self._options) - - super().setUp() + cls._options['br0'] = [] + for member in cls._members: + cls._options['br0'].append(f'member interface {member}') + cls._interfaces = list(cls._options) def test_add_remove_bridge_member(self): # Add member interfaces to bridge and set STP cost/priority |