Merge branch 'v_to_p_map' into p_list

SpiNNakerManchester · Apr 19, 2024 · dd6f794 · dd6f794
2 parents 58a93fe + 8fadd50
commit dd6f794
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 10 deletions.
diff --git a/unittests/data/test_data.py b/unittests/data/test_data.py
@@ -13,7 +13,6 @@
 # limitations under the License.
 
 import unittest
-from spinn_utilities.config_holder import set_config
 from spinn_utilities.exceptions import (DataNotYetAvialable)
 from spinnman.config_setup import unittest_setup
 from spinnman.data import SpiNNManDataView
@@ -33,13 +32,6 @@ def test_setup(self):
         with self.assertRaises(DataNotYetAvialable):
             SpiNNManDataView.get_transceiver()
 
-    def test_mock(self):
-        SpiNNManDataWriter.mock()
-        set_config("Machine", "version", 5)
-        # check there is a
-        #   value not what it is
-        SpiNNManDataView.get_machine()
-
     def test_transceiver(self):
         writer = SpiNNManDataWriter.setup()
         with self.assertRaises(DataNotYetAvialable):

diff --git a/unittests/model_tests/test_abstract_process.py b/unittests/model_tests/test_abstract_process.py
@@ -13,6 +13,7 @@
 # limitations under the License.
 
 from spinn_utilities.config_holder import set_config
+from spinn_machine.version.version_strings import VersionStrings
 from spinnman.processes.abstract_multi_connection_process import (
     AbstractMultiConnectionProcess)
 from spinnman.messages.scp.impl import ReadMemory
@@ -40,7 +41,7 @@ def receive_scp_response(self, timeout=1.0):
 
 def test_error_print():
     unittest_setup()
-    set_config("Machine", "version", 5)
+    set_config("Machine", "versions", VersionStrings.ANY.text)
     connection = MockConnection(0, 0)
     process = MockProcess(RoundRobinConnectionSelector([connection]))
     with pytest.raises(SpinnmanGenericProcessException):

diff --git a/unittests/test_transceiver.py b/unittests/test_transceiver.py
@@ -15,6 +15,7 @@
 import unittest
 import struct
 from spinn_utilities.config_holder import set_config
+from spinn_machine.version.version_strings import VersionStrings
 from spinnman.config_setup import unittest_setup
 from spinnman.data import SpiNNManDataView
 from spinnman.data.spinnman_data_writer import SpiNNManDataWriter
@@ -83,7 +84,7 @@ def test_boot_board(self):
         trans._boot_board()
 
     def test_set_watch_dog(self):
-        set_config("Machine", "version", 5)
+        set_config("Machine", "versions", VersionStrings.ANY.text)
         connections = []
         connections.append(SCAMPConnection(remote_host=None))
         tx = MockExtendedTransceiver()