From 34e6cdd902ba3843246aa83d1b8e12b77caec323 Mon Sep 17 00:00:00 2001 From: Vincent Michel Date: Tue, 31 Jan 2017 16:13:51 +0100 Subject: [PATCH] Make tests more reliable --- tests/test_client.py | 2 +- tests/test_event.py | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/tests/test_client.py b/tests/test_client.py index 5c766a59..55da7cbe 100644 --- a/tests/test_client.py +++ b/tests/test_client.py @@ -204,7 +204,7 @@ def test_read_attribute(tango_test, readable_attribute): # This is a hack: # Without this sleep, the following error is very likely to be raised: # -> MARSHAL CORBA system exception: MARSHAL_PassEndOfMessage - if readable_attribute == "string_image_ro": + if readable_attribute in ["string_image_ro", "string_spectrum_ro"]: sleep(0.05) tango_test.read_attribute(readable_attribute, wait=True) diff --git a/tests/test_event.py b/tests/test_event.py index ff2abffa..86b4a278 100644 --- a/tests/test_event.py +++ b/tests/test_event.py @@ -77,8 +77,10 @@ def callback(evt): "attr", EventType.CHANGE_EVENT, callback, wait=True) event_device.command_inout("send_event", wait=True) # Wait for tango event - event_device.read_attribute("state", wait=True) - event_device.read_attribute("state", wait=True) - event_device.read_attribute("state", wait=True) + retries = 10 + for _ in range(retries): + event_device.read_attribute("state", wait=True) + if len(results) > 1: + break # Test the event values assert results == [0., 1.]