diff --git a/README.md b/README.md index 5c5431b2f40f4525be3017ec24c041cc4682dd57..e6c922d7948da1fd6e16c36acce980aadb0cd9b6 100644 --- a/README.md +++ b/README.md @@ -110,6 +110,7 @@ Next change the version in the following places: # Release Notes +* 0.11.2 Fix sleep duration in archiver test * 0.11.1 Fix event unsubscription in TemperatureManager * 0.11.0 Added StationManager device * 0.10.0 Add `AntennaToSdpMapper` and fpga_sdp_info_* mapped attributes in `Antennafield` device diff --git a/tangostationcontrol/VERSION b/tangostationcontrol/VERSION index af88ba824866fdf61bd6e3c8f83203f5d93d062b..bc859cbd6d998ecfd13ee4c49cd5da054afb36ad 100644 --- a/tangostationcontrol/VERSION +++ b/tangostationcontrol/VERSION @@ -1 +1 @@ -0.11.1 +0.11.2 diff --git a/tangostationcontrol/tangostationcontrol/integration_test/default/toolkit/test_archiver.py b/tangostationcontrol/tangostationcontrol/integration_test/default/toolkit/test_archiver.py index 08af5e3473911b5cf4965b87c1d26340486ecba7..7c8fd99f9ee0dc8c4fedbf0c2a80644185f56cf2 100644 --- a/tangostationcontrol/tangostationcontrol/integration_test/default/toolkit/test_archiver.py +++ b/tangostationcontrol/tangostationcontrol/integration_test/default/toolkit/test_archiver.py @@ -70,7 +70,9 @@ class TestArchiver(BaseIntegrationTestCase): # Retrieve data from DB views self.retriever = RetrieverTimescale() self.assertIsNotNone(self.retriever) - records = self._wait_for_archiving(attr_fullname, archive_event_period) + records = self._wait_for_archiving( + attr_fullname, archive_event_period * 2 + ) # wait for >1 period to avoid race conditions self.assertTrue(len(records) > 0) item = records[-1] # last table record self.assertEqual("stat/recv/1", item.device) # column device @@ -231,12 +233,12 @@ class TestArchiver(BaseIntegrationTestCase): self.assertEqual(9, len(sdp_archived_attrs)) def _wait_for_archiving( - self, attr_fullname: str, archive_event_period: int, max_wait: int = 10 + self, attr_fullname: str, archive_event_period_ms: int, max_wait: int = 10 ): wait = 0 records = self.retriever.get_lofar_attribute(attr_fullname) while not (len(records) > 0) and wait < max_wait: - time.sleep(archive_event_period) + time.sleep(archive_event_period_ms / 1000.0) records = self.retriever.get_lofar_attribute(attr_fullname) wait += 1 return records