From 3ba678d757583bfe83aa2b6b6201618eb87b0855 Mon Sep 17 00:00:00 2001
From: felmer <felmer>
Date: Wed, 3 Sep 2014 12:41:13 +0000
Subject: [PATCH] SSDM-802: Bug fixing: Increasing wait for registration
finished for all screening system tests.
SVN: 32403
---
.../screening/systemtests/AbstractImageDropboxTestCase.java | 6 ------
.../systemtests/AbstractScreeningSystemTestCase.java | 6 ++++++
.../screening/systemtests/MicroscopyImageDropboxTest.java | 3 +--
.../screening/systemtests/SimpleImageDropboxTest.java | 1 +
4 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/screening/sourceTest/java/ch/systemsx/cisd/openbis/screening/systemtests/AbstractImageDropboxTestCase.java b/screening/sourceTest/java/ch/systemsx/cisd/openbis/screening/systemtests/AbstractImageDropboxTestCase.java
index 2f891adc9f2..dd558dd27fb 100644
--- a/screening/sourceTest/java/ch/systemsx/cisd/openbis/screening/systemtests/AbstractImageDropboxTestCase.java
+++ b/screening/sourceTest/java/ch/systemsx/cisd/openbis/screening/systemtests/AbstractImageDropboxTestCase.java
@@ -91,12 +91,6 @@ public abstract class AbstractImageDropboxTestCase extends AbstractScreeningSyst
return "../screening/resource/test-data/" + getClass().getSimpleName();
}
- @Override
- protected int dataSetImportWaitDurationInSeconds()
- {
- return 120;
- }
-
protected AbstractExternalData getRegisteredContainerDataSet()
{
List<AbstractExternalData> dataSets = getRegisteredDataSets();
diff --git a/screening/sourceTest/java/ch/systemsx/cisd/openbis/screening/systemtests/AbstractScreeningSystemTestCase.java b/screening/sourceTest/java/ch/systemsx/cisd/openbis/screening/systemtests/AbstractScreeningSystemTestCase.java
index 0b907cd92ac..a3cb97ab6bc 100644
--- a/screening/sourceTest/java/ch/systemsx/cisd/openbis/screening/systemtests/AbstractScreeningSystemTestCase.java
+++ b/screening/sourceTest/java/ch/systemsx/cisd/openbis/screening/systemtests/AbstractScreeningSystemTestCase.java
@@ -379,4 +379,10 @@ public abstract class AbstractScreeningSystemTestCase extends SystemTestCase
return new File(rootDir, "incoming-" + getClass().getSimpleName());
}
+ @Override
+ protected int dataSetImportWaitDurationInSeconds()
+ {
+ return 600;
+ }
+
}
diff --git a/screening/sourceTest/java/ch/systemsx/cisd/openbis/screening/systemtests/MicroscopyImageDropboxTest.java b/screening/sourceTest/java/ch/systemsx/cisd/openbis/screening/systemtests/MicroscopyImageDropboxTest.java
index 773f8c78512..6c1168ef180 100644
--- a/screening/sourceTest/java/ch/systemsx/cisd/openbis/screening/systemtests/MicroscopyImageDropboxTest.java
+++ b/screening/sourceTest/java/ch/systemsx/cisd/openbis/screening/systemtests/MicroscopyImageDropboxTest.java
@@ -31,10 +31,9 @@ import ch.systemsx.cisd.openbis.generic.shared.basic.dto.SampleType;
import ch.systemsx.cisd.openbis.generic.shared.dto.identifier.ProjectIdentifierFactory;
/**
- *
- *
* @author Franz-Josef Elmer
*/
+@Test(groups = { "slow", "systemtest" })
public class MicroscopyImageDropboxTest extends AbstractImageDropboxTestCase
{
diff --git a/screening/sourceTest/java/ch/systemsx/cisd/openbis/screening/systemtests/SimpleImageDropboxTest.java b/screening/sourceTest/java/ch/systemsx/cisd/openbis/screening/systemtests/SimpleImageDropboxTest.java
index 61254ad3b87..f5ae05db0bb 100644
--- a/screening/sourceTest/java/ch/systemsx/cisd/openbis/screening/systemtests/SimpleImageDropboxTest.java
+++ b/screening/sourceTest/java/ch/systemsx/cisd/openbis/screening/systemtests/SimpleImageDropboxTest.java
@@ -27,6 +27,7 @@ import ch.systemsx.cisd.openbis.generic.shared.basic.dto.AbstractExternalData;
*
* @author Franz-Josef Elmer
*/
+@Test(groups = { "slow", "systemtest" })
public class SimpleImageDropboxTest extends AbstractImageDropboxTestCase
{
--
GitLab