Merge pull request #244 from DMSC-Instrument-Data/241_fix_switch_setup

Fix switch_setup bug

lewis/core/adapters.py

@@ -236,6 +236,11 @@ def device_lock(self):
         """
         return self._lock
 
+    def set_device(self, new_device):
+        """Bind the new device to all interfaces managed by the adapters in the collection."""
+        for adapter in self._adapters.values():
+            adapter.interface.device = new_device
+
     def add_adapter(self, adapter):
         """
         Adds the supplied adapter to the container but raises a ``RuntimeError`` if there's

lewis/core/simulation.py

@@ -152,7 +152,7 @@ def switch_setup(self, new_setup):
         """
         try:
             self._device = self._device_builder.create_device(new_setup)
-            self._adapters.device = self._device
+            self._adapters.set_device(self._device)
             self.log.info('Switched setup to \'%s\'', new_setup)
         except Exception as e:
             self.log.error(

test/test_core_adapters.py

@@ -163,3 +163,12 @@ def test_configuration(self):
                              {
                                  'protocol_b': {'bar': True, 'foo': False},
                              })
+
+    def test_set_device(self):
+        adapter = DummyAdapter(protocol='foo')
+        adapter.interface = MagicMock()
+
+        collection = AdapterCollection(adapter)
+        collection.set_device('test')
+
+        self.assertEqual(adapter.interface.device, 'test')