From 1582274bad9f777cd3acecb594af54ea836c5e6a Mon Sep 17 00:00:00 2001 From: "Christian Y. Brenninkmeijer" Date: Tue, 29 Aug 2023 10:24:02 +0100 Subject: [PATCH 1/2] use View get_machine_version() --- spinnaker_testbase/root_test_case.py | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/spinnaker_testbase/root_test_case.py b/spinnaker_testbase/root_test_case.py index fd35d9b..0c531eb 100644 --- a/spinnaker_testbase/root_test_case.py +++ b/spinnaker_testbase/root_test_case.py @@ -49,12 +49,10 @@ def assert_not_spin_three(): :raises SkipTest: If we're on the wrong sort of board """ - if has_config_option("Machine", "version"): - version = get_config_str("Machine", "version") - virtual = get_config_bool("Machine", "virtual_board") - if version in ["2", "3"] and not virtual: - raise SkipTest( - f"This test will not run on a spinn-{version} board") + version = FecDataView.get_machine_version().number + if not version == 5: + raise SkipTest( + f"This test will not run on a spinn-{version} board") def error_file(self): """ From 25940d2a0fcd679421f10280235a19281a3b7e12 Mon Sep 17 00:00:00 2001 From: "Christian Y. Brenninkmeijer" Date: Tue, 29 Aug 2023 10:44:50 +0100 Subject: [PATCH 2/2] flake8 --- spinnaker_testbase/root_test_case.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/spinnaker_testbase/root_test_case.py b/spinnaker_testbase/root_test_case.py index 0c531eb..615ad5a 100644 --- a/spinnaker_testbase/root_test_case.py +++ b/spinnaker_testbase/root_test_case.py @@ -19,8 +19,6 @@ from unittest import SkipTest from spinn_utilities.exceptions import NotSetupException from spinnman.exceptions import SpinnmanException -from spinn_utilities.config_holder import ( - get_config_bool, get_config_str, has_config_option) from pacman.exceptions import PacmanPartitionException, PacmanValueError from spalloc_client.job import JobDestroyedError from spinn_front_end_common.data import FecDataView