Skip to content

W
White Rabbit Trigger Distribution
Commit 82f314e3 authored by Dimitris Lampridis's avatar Dimitris Lampridis
Browse files
Options

pytest: cleanup fw_name test

parent 09b9a6e3
Hide whitespace changes
Inline Side-by-side
Showing with 8 additions and 9 deletions
pytest/tests/WrtdTestHelper.py
View file @ 82f314e3
......@@ -55,9 +55,10 @@ class FmcAdc100m(PyFmcAdc100m14b4ch):
return False
class WrtdTestNode(PyWrtd):
def __init__(self, node_id):
def __init__(self, node_id, fw_name):
PyWrtd.__init__(self, node_id)
self.node_id = node_id
self.expected_fw_name = fw_name
self.disable_all_alarms()
self.remove_all_alarms()
......
pytest/tests/test_WrtdRefDesigns.py
View file @ 82f314e3
......@@ -15,15 +15,15 @@ def fmc_adc():
@pytest.fixture()
def adc():
return WrtdTestNode(pytest.adc_node)
return WrtdTestNode(pytest.adc_node, 'wrtd-adc-x2')
@pytest.fixture()
def tdc():
return WrtdTestNode(pytest.tdc_node)
return WrtdTestNode(pytest.tdc_node, 'wrtd-tdc-x2')
@pytest.fixture()
def fdelay():
return WrtdTestNode(pytest.fd_node)
return WrtdTestNode(pytest.fd_node, 'wrtd-fd-x2')
class TestWrtdRefDesigns(object):
"""
......@@ -34,12 +34,10 @@ class TestWrtdRefDesigns(object):
node_count = PyWrtd.get_node_count()
assert node_count == 3
@pytest.mark.parametrize('node, fw_name', [('adc', 'wrtd-adc-x2'),
('tdc', 'wrtd-tdc-x2'),
('fdelay', 'wrtd-fd-x2')])
def test_fw_name(self, node, fw_name, request):
@pytest.mark.parametrize('node', ['adc', 'tdc', 'fdelay'])
def test_fw_name(self, node, request, adc, tdc, fdelay):
wrtd = request.getfixturevalue(node)
assert wrtd.get_fw_name(0) == fw_name
assert wrtd.get_fw_name(0) == wrtd.expected_fw_name
@pytest.mark.parametrize('tx_node, rx_nodes',
[('adc', ['fdelay']),
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment