From 83944787fdd44cfa7da727a6e635e327f599721f Mon Sep 17 00:00:00 2001
From: pkupczyk <pkupczyk>
Date: Mon, 21 Oct 2013 13:54:36 +0000
Subject: [PATCH] SP-952 / BIS-548 : Novartis: API Access to attachements in
dropboxes - improve a wait condition
SVN: 29996
---
.../datastoreserver/systemtests/AttachmentsDropboxTest.java | 2 +-
.../openbis/datastoreserver/systemtests/SystemTestCase.java | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/AttachmentsDropboxTest.java b/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/AttachmentsDropboxTest.java
index 8aebd995421..6ae429d37c8 100644
--- a/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/AttachmentsDropboxTest.java
+++ b/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/AttachmentsDropboxTest.java
@@ -75,7 +75,7 @@ public class AttachmentsDropboxTest extends SystemTestCase
public void testAttachmentsWithFailure() throws Exception
{
createData("failure");
- waitUntilDataSetImportedWithError();
+ waitUntilDataSetImportedWithError("attachments-test");
assertStreamsReleased(3);
}
diff --git a/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/SystemTestCase.java b/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/SystemTestCase.java
index fe7ffa0f0b0..2ee22f4dc20 100644
--- a/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/SystemTestCase.java
+++ b/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/SystemTestCase.java
@@ -269,7 +269,7 @@ public abstract class SystemTestCase extends AssertJUnit
}
- protected void waitUntilDataSetImportedWithError() throws Exception
+ protected void waitUntilDataSetImportedWithError(String dropboxName) throws Exception
{
final int maxLoops = dataSetImportWaitDurationInSeconds();
@@ -278,7 +278,7 @@ public abstract class SystemTestCase extends AssertJUnit
Thread.sleep(1000);
String logContent = getLogAppender().getLogContent();
- if (logContent.contains("ERROR"))
+ if (logContent.contains("ERROR") && logContent.contains(dropboxName))
{
return;
}
--
GitLab