SP-952 / BIS-548 : Novartis: API Access to attachements in dropboxes - improve a wait condition

SVN: 29996

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);
     }
 

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;
             }