diff --git a/datastore_server/sourceTest/java/ch/ethz/sis/openbis/generic/dss/systemtest/api/v3/ObjectsImportTest.java b/datastore_server/sourceTest/java/ch/ethz/sis/openbis/generic/dss/systemtest/api/v3/ObjectsImportTest.java index 97808fd9202e1384d5b135864bd8ab5a2968892e..e362ad88e49c5836bc11d1de0ac569201752fa06 100644 --- a/datastore_server/sourceTest/java/ch/ethz/sis/openbis/generic/dss/systemtest/api/v3/ObjectsImportTest.java +++ b/datastore_server/sourceTest/java/ch/ethz/sis/openbis/generic/dss/systemtest/api/v3/ObjectsImportTest.java @@ -233,18 +233,30 @@ public class ObjectsImportTest extends AbstractFileTest protected void assertNoEmails(long timestamp) { - Email latestEmail = EmailUtil.findLatestEmail(); + Email latestEmail = waitAndFindLatestEmail(); assertTrue("Timestamp: " + timestamp + ", Latest email: " + latestEmail, latestEmail == null || latestEmail.timestamp < timestamp); } protected void assertEmail(long timestamp, String expectedEmail, String expectedSubject) { - Email latestEmail = EmailUtil.findLatestEmail(); + Email latestEmail = waitAndFindLatestEmail(); assertTrue("Timestamp: " + timestamp + ", Latest email: " + latestEmail, latestEmail != null && latestEmail.timestamp >= timestamp); assertEquals(expectedEmail, latestEmail.to); assertTrue(latestEmail.subject, latestEmail.subject.contains(expectedSubject)); } + private Email waitAndFindLatestEmail() + { + try + { + Thread.sleep(1000); + } catch (InterruptedException e) + { + // silently ignored + } + return EmailUtil.findLatestEmail(); + } + public static class ImportFile {