Merge branch 'reraise-on-fault' into 'master'

Reraise exceptions too if we go to FAULT

See merge request !361

tangostationcontrol/tangostationcontrol/devices/device_decorators.py

@@ -55,11 +55,9 @@ def fault_on_error():
             try:
                 return func(self, *args, **kwargs)
             except Exception as e:
-
                 logger.exception("Function failed.")
                 self.Fault(f"FAULT in {func.__name__}: {e.__class__.__name__}: {e}")
-
-                return None
+                raise
 
         return error_wrapper
 

tangostationcontrol/tangostationcontrol/test/devices/test_observation_device.py

@@ -41,8 +41,8 @@ class TestObservationDevice(device_base.DeviceTestCase, test_observation_base.Te
         with DeviceTestContext(observation.Observation, process=True) as proxy:
             proxy.off()
             proxy.observation_settings_RW = "{}"
+            with self.assertRaises(DevFailed):
                 proxy.Initialise()
-            self.assertEqual(DevState.FAULT, proxy.state())
 
     def test_prohibit_rewriting_settings(self):
         """Test that changing observation settings is disallowed once init"""