TST #632 add wait after reset()

apstools/synApps/tests/test_swait.py

@@ -1,13 +1,12 @@
 import pytest
-import time
 
 from ..swait import setup_random_number_swait
 from ..swait import SwaitRecord
 from ..swait import UserCalcN
 from ..swait import UserCalcsDevice
 from ...tests import common_attribute_quantities_test
 from ...tests import IOC
-# from ...tests import SHORT_DELAY_FOR_EPICS_IOC_DATABASE_PROCESSING
+from ...tests import short_delay_for_EPICS_IOC_database_processing
 
 
 @pytest.mark.parametrize(
@@ -44,18 +43,19 @@ def test_userCalcs_reset():
     swait.enable.put("E")  # Note: only "E"
 
     setup_random_number_swait(swait)
-    time.sleep(0.2)
+    short_delay_for_EPICS_IOC_database_processing(0.2)
     assert swait.description.get() == "uniform random numbers"
     assert swait.calculation.get() == "RNDM"
     v1 = swait.calculated_value.get()
-    time.sleep(0.2)
+    short_delay_for_EPICS_IOC_database_processing(0.2)
     assert v1 != swait.calculated_value.get()
 
     swait.reset()
+    short_delay_for_EPICS_IOC_database_processing()
     assert swait.description.get() == swait.prefix
     assert swait.calculation.get() == "0"
     v1 = swait.calculated_value.get()
-    time.sleep(0.2)
+    short_delay_for_EPICS_IOC_database_processing(0.2)
     assert v1 == swait.calculated_value.get()
 
 # -----------------------------------------------------------------------------

apstools/tests/__init__.py

@@ -1,10 +1,17 @@
+import time
 import warnings
 
 IOC = "gp:"
 MAX_TESTING_RETRIES = 3
 SHORT_DELAY_FOR_EPICS_IOC_DATABASE_PROCESSING = 2. / 60  # two 60Hz clock cycles
 
 
+def short_delay_for_EPICS_IOC_database_processing(delay=None):
+    if delay is None:
+        delay = SHORT_DELAY_FOR_EPICS_IOC_DATABASE_PROCESSING
+    time.sleep(delay)
+
+
 def common_attribute_quantities_test(device, pv, connect, attr, expected):
     """
     Verify the quantities of an attribute.