Merge branch 'master' into split_synapse_neuron_models

pacman/config_setup.py

@@ -21,15 +21,15 @@
 BASE_CONFIG_FILE = "pacman.cfg"
 
 
-def reset_configs():
+def unittest_setup():
     """
     Resets the configs so only the local default config is included.
 
     .. note::
         This file should only be called from PACMAN/unittests
 
     """
-    clear_cfg_files()
+    clear_cfg_files(True)
     add_pacman_cfg()
 
 

pacman_integration_tests/test_big_compression.py

@@ -18,6 +18,7 @@
 import sys
 import unittest
 
+from pacman.config_setup import unittest_setup
 from pacman.model.routing_tables.multicast_routing_tables import (from_json)
 from pacman.operations.router_compressors.routing_compression_checker import (
     compare_tables)
@@ -30,6 +31,9 @@
 
 class TestBigCompression(unittest.TestCase):
 
+    def setUp(self):
+        unittest_setup()
+
     def test_big(self):
         class_file = sys.modules[self.__module__].__file__
         path = os.path.dirname(os.path.abspath(class_file))

unittests/model_tests/algorithm_classes_tests/test_python_class_algorithm.py

@@ -14,6 +14,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 import unittest
+from pacman.config_setup import unittest_setup
 from pacman.executor.algorithm_classes import PythonClassAlgorithm
 
 
@@ -22,6 +23,9 @@ class TestPythonClassAlgorithm(unittest.TestCase):
     tests which test the application graph object
     """
 
+    def setUp(self):
+        unittest_setup()
+
     def test_python_class(self):
         python_module = "Foo"
         python_class = "Bar"

unittests/model_tests/algorithm_classes_tests/test_python_function_algorithm.py

@@ -14,6 +14,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 import unittest
+from pacman.config_setup import unittest_setup
 from pacman.executor.algorithm_classes import PythonFunctionAlgorithm
 
 
@@ -22,6 +23,9 @@ class TestPythonFunctionAlgorithm(unittest.TestCase):
     tests which test the application graph object
     """
 
+    def setUp(self):
+        unittest_setup()
+
     def test_python_module(self):
         python_module = "Foo"
         python_function = "bar"

unittests/model_tests/application_graph_tests/test_application_edge.py

@@ -14,6 +14,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 import unittest
+from pacman.config_setup import unittest_setup
 from pacman_test_objects import SimpleTestEdge, SimpleTestVertex
 
 
@@ -22,6 +23,9 @@ class TestApplicationEdgeModel(unittest.TestCase):
     tests which test the application graph object
     """
 
+    def setUp(self):
+        unittest_setup()
+
     def test_create_new_edge(self):
         """
         test that you can create a edge between two vertices

unittests/model_tests/application_graph_tests/test_application_graph.py

@@ -14,6 +14,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 import unittest
+from pacman.config_setup import unittest_setup
 from pacman.exceptions import PacmanConfigurationException
 from pacman.model.graphs.application import ApplicationGraphView
 from pacman.model.graphs.application import ApplicationEdge, ApplicationGraph
@@ -25,6 +26,9 @@ class TestApplicationGraphModel(unittest.TestCase):
     tests which test the application graph object
     """
 
+    def setUp(self):
+        unittest_setup()
+
     def test_create_new_empty_graph(self):
         ApplicationGraph("foo")
 

unittests/model_tests/application_graph_tests/test_application_vertex.py

@@ -15,6 +15,7 @@
 
 import numpy
 import unittest
+from pacman.config_setup import unittest_setup
 from pacman.exceptions import PacmanInvalidParameterException
 from pacman.model.constraints.partitioner_constraints import (
     MaxVertexAtomsConstraint)
@@ -28,6 +29,10 @@ class TestApplicationGraphModel(unittest.TestCase):
     """
     tests which test the application graph object
     """
+
+    def setUp(self):
+        unittest_setup()
+
     def test_create_new_vertex(self):
         """
         test initialisation of a vertex

unittests/model_tests/graph_mapper_tests/test_graph_mapping.py

@@ -18,6 +18,7 @@
 """
 import unittest
 
+from pacman.config_setup import unittest_setup
 from pacman.model.graphs.application import ApplicationGraph
 from pacman.model.graphs.common import Slice
 from pacman.model.graphs.machine import MachineEdge, SimpleMachineVertex, \
@@ -30,6 +31,9 @@ class TestGraphMapping(unittest.TestCase):
     graph mapper tests
     """
 
+    def setUp(self):
+        unittest_setup()
+
     def test_get_edges_from_edge(self):
         """
         test getting the edges from a graph mapper from a edge

unittests/model_tests/graph_mapper_tests/test_slice.py

@@ -17,6 +17,7 @@
 tests for slice
 """
 import unittest
+from pacman.config_setup import unittest_setup
 from pacman.exceptions import PacmanValueError
 from pacman.model.graphs.common import Slice
 
@@ -26,6 +27,9 @@ class TestSliceFunctions(unittest.TestCase):
     slice function tests
     """
 
+    def setUp(self):
+        unittest_setup()
+
     def test_create_slice_valid(self):
         """
         test creating a empty slice

unittests/model_tests/machine_graph_tests/test_machine_graph_model.py

@@ -14,6 +14,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 import unittest
+from pacman.config_setup import unittest_setup
 from pacman.model.graphs.application import ApplicationGraph
 from pacman.model.graphs.common import EdgeTrafficType
 from pacman.model.graphs.machine import (
@@ -31,6 +32,9 @@ class TestMachineGraphModel(unittest.TestCase):
     Tests that test the functionality of the machine graph object
     """
 
+    def setUp(self):
+        unittest_setup()
+
     def test_new_vertex(self):
         """
         test the creation of a machine vertex

unittests/model_tests/partitioner_splitters_tests/splitter_slice_legacy_test.py

@@ -15,6 +15,7 @@
 
 import unittest
 from testfixtures import LogCapture
+from pacman.config_setup import unittest_setup
 from pacman.exceptions import PacmanConfigurationException
 from pacman.model.partitioner_splitters import SplitterSliceLegacy
 from pacman_test_objects import (
@@ -25,6 +26,9 @@ class TestSplitterSliceLegacy(unittest.TestCase):
     """ Tester for pacman.model.constraints.placer_constraints
     """
 
+    def setUp(self):
+        unittest_setup()
+
     def test_no_api(self):
         splitter = SplitterSliceLegacy()
         vertex = NonLegacyApplicationVertex()

unittests/model_tests/placement_tests/test_placement_constraints.py

@@ -14,6 +14,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 import unittest
+from pacman.config_setup import unittest_setup
 from pacman.model.constraints.placer_constraints import (
     BoardConstraint, ChipAndCoreConstraint, RadialPlacementFromChipConstraint,
     SameChipAsConstraint)
@@ -24,6 +25,9 @@ class TestPlacementConstraints(unittest.TestCase):
     """ Tester for pacman.model.constraints.placer_constraints
     """
 
+    def setUp(self):
+        unittest_setup()
+
     def test_board_constraint(self):
         c1 = BoardConstraint("1.2.3.4")
         self.assertEqual(c1.board_address, "1.2.3.4")

unittests/model_tests/placement_tests/test_placement_object.py

@@ -17,6 +17,7 @@
 tests for placement
 """
 import unittest
+from pacman.config_setup import unittest_setup
 from pacman.exceptions import PacmanAlreadyPlacedError
 from pacman.model.graphs.machine import SimpleMachineVertex
 from pacman.model.placements import Placement, Placements
@@ -27,6 +28,9 @@ class TestPlacement(unittest.TestCase):
     tester for placement object in pacman.model.placements.placement
     """
 
+    def setUp(self):
+        unittest_setup()
+
     def test_create_new_placement(self):
         """
         test that creating a new placement puts stuff in the right place

unittests/model_tests/placement_tests/test_placements_model.py

@@ -17,6 +17,7 @@
 tests for placements
 """
 import unittest
+from pacman.config_setup import unittest_setup
 from pacman.model.graphs.machine import SimpleMachineVertex
 from pacman.model.placements import Placement, Placements
 
@@ -26,6 +27,9 @@ class TestPlacements(unittest.TestCase):
     tester for placements object in pacman.model.placements.placements
     """
 
+    def setUp(self):
+        unittest_setup()
+
     def test_create_new_placements(self):
         """
         test creating a placements object

unittests/model_tests/resources_tests/test_resources_model.py

@@ -19,6 +19,7 @@
 from enum import Enum
 import tempfile
 import unittest
+from pacman.config_setup import unittest_setup
 from pacman.model.resources import (
     ConstantSDRAM, CPUCyclesPerTickResource, DTCMResource, ResourceContainer,
     IPtagResource, MultiRegionSDRAM, ReverseIPtagResource,
@@ -36,6 +37,9 @@ class TestResourceModels(unittest.TestCase):
     unit tests on the resources object
     """
 
+    def setUp(self):
+        unittest_setup()
+
     def test_sdram(self):
         """
         test that adding a SDRAM resource to a resource container works

unittests/model_tests/routing_info_tests/test_routing_info.py

@@ -14,7 +14,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 import unittest
-
+from pacman.config_setup import unittest_setup
 from pacman.model.graphs.machine import MulticastEdgePartition
 from pacman.model.resources import ResourceContainer
 from pacman.exceptions import (
@@ -28,6 +28,9 @@
 
 class TestRoutingInfo(unittest.TestCase):
 
+    def setUp(self):
+        unittest_setup()
+
     def test_routing_info(self):
         # mock to avoid having to create a graph for this test
         graph_code = 123

unittests/model_tests/routing_table_tests/test_routing_tables_model.py

@@ -14,7 +14,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 import unittest
-
+from pacman.config_setup import unittest_setup
 from pacman.model.graphs.machine import MulticastEdgePartition
 from spinn_machine import MulticastRoutingEntry
 from pacman.model.routing_tables import (
@@ -32,6 +32,10 @@ class TestRoutingTable(unittest.TestCase):
     """
     tests for the routing table object
     """
+
+    def setUp(self):
+        unittest_setup()
+
     def test_new_multicast_routing_table_entry(self):
         """
         test that creating a multicast routing entry works

unittests/model_tests/splitter_tests/test_one_app_one_machine.py

@@ -14,6 +14,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 import unittest
+from pacman.config_setup import unittest_setup
 from pacman.exceptions import PacmanConfigurationException
 from pacman.model.graphs.application.abstract import (
     AbstractOneAppOneMachineVertex)
@@ -22,6 +23,10 @@
 
 
 class TestSplitterOneAppOneMachine(unittest.TestCase):
+
+    def setUp(self):
+        unittest_setup()
+
     def test_legacy(self):
         splitter = SplitterOneAppOneMachine("foo")
         v1 = NonLegacyApplicationVertex("v1")

unittests/model_tests/splitter_tests/test_splitter_slice_legacy.py

@@ -14,13 +14,18 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 import unittest
+from pacman.config_setup import unittest_setup
 from pacman.exceptions import PacmanConfigurationException
 from pacman.model.partitioner_splitters import SplitterSliceLegacy
 from pacman_test_objects import (
     DuckLegacyApplicationVertex, NonLegacyApplicationVertex, SimpleTestVertex)
 
 
 class TestSplitterSliceLegacy(unittest.TestCase):
+
+    def setUp(self):
+        unittest_setup()
+
     def test_api(self):
         splitter = SplitterSliceLegacy("foo")
         a = str(splitter)

unittests/model_tests/tag_tests/test_tag_infos_model.py

@@ -18,6 +18,7 @@
 """
 import unittest
 from spinn_machine.tags import IPTag, ReverseIPTag
+from pacman.config_setup import unittest_setup
 from pacman.exceptions import PacmanInvalidParameterException
 from pacman.model.graphs.machine import SimpleMachineVertex
 from pacman.model.tags import Tags
@@ -28,6 +29,9 @@ class TestTagsModel(unittest.TestCase):
     test that the tags object works as expected
     """
 
+    def setUp(self):
+        unittest_setup()
+
     def test_new_tag_info(self):
         """
         test that creating a empty tag object works

unittests/model_tests/test_key_allocator.py

@@ -14,6 +14,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 import unittest
+from pacman.config_setup import unittest_setup
 from pacman.model.routing_info import BaseKeyAndMask
 from pacman.utilities.utility_objs import Field
 from pacman.model.constraints.key_allocator_constraints import (
@@ -22,6 +23,10 @@
 
 
 class TestKeyAllocatorConstraints(unittest.TestCase):
+
+    def setUp(self):
+        unittest_setup()
+
     def test_contiguous_key_range_constraint(self):
         c1 = ContiguousKeyRangeContraint()
         c2 = ContiguousKeyRangeContraint()