tests: Use XLSX for the CORONET topology

Now that XLSX is officially supported, it should be tested as well.

Change-Id: I9286d3cb56950d554582d2eaf8153da5ffdd771a
This commit is contained in:
Jan Kundrát
2020-03-21 13:18:09 +01:00
parent 1f1877f7a9
commit 82ce3384ba
5 changed files with 5 additions and 5 deletions

View File

@@ -42,7 +42,7 @@ eqpt_filename = DATA_DIR / 'eqpt_config.json'
@pytest.mark.parametrize('xls_input,expected_json_output', {
DATA_DIR / 'CORONET_Global_Topology.xls': DATA_DIR / 'CORONET_Global_Topology_expected.json',
DATA_DIR / 'CORONET_Global_Topology.xlsx': DATA_DIR / 'CORONET_Global_Topology_expected.json',
DATA_DIR / 'testTopology.xls': DATA_DIR / 'testTopology_expected.json',
}.items())
def test_excel_json_generation(xls_input, expected_json_output):
@@ -70,7 +70,7 @@ def test_excel_json_generation(xls_input, expected_json_output):
# test that the build network gives correct results in gain mode
@pytest.mark.parametrize('xls_input,expected_json_output',
{DATA_DIR / 'CORONET_Global_Topology.xls':\
{DATA_DIR / 'CORONET_Global_Topology.xlsx':\
DATA_DIR / 'CORONET_Global_Topology_auto_design_expected.json',
DATA_DIR / 'testTopology.xls':\
DATA_DIR / 'testTopology_auto_design_expected.json',