Merge pull request #1023 from DominicOram/master

Added timeout arguments to FakeEpicsSignal
bluesky · Dec 15, 2021 · df60483 · df60483
2 parents 9e6c7de + 02c2d24
commit df60483
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/ophyd/sim.py b/ophyd/sim.py
@@ -1217,6 +1217,7 @@ class FakeEpicsSignal(SynSignal):
 
  def __init__(self, read_pv, write_pv=None, *, put_complete=False,
  string=False, limits=False, auto_monitor=False, name=None,
+ timeout=None, write_timeout=None, connection_timeout=None,
  **kwargs):
  """
  Mimic EpicsSignal signature

diff --git a/ophyd/tests/test_sim.py b/ophyd/tests/test_sim.py
@@ -127,7 +127,7 @@ class SampleNested(Device):
 
 class Sample(Device):
  egg = Cpt(SampleNested, ':EGG')
- butter = Cpt(EpicsSignal, ':BUTTER')
+ butter = Cpt(EpicsSignal, ':BUTTER', timeout=10.0, write_timeout=10.0, connection_timeout=10.0)
  flour = Cpt(EpicsSignalRO, ':FLOUR')
  baster = FCpt(EpicsSignal, '{self.drawer}:BASTER')
  sink = FCpt(EpicsSignal, '{self.sink_location}:SINK')