From fe66598ab09af505b0139ea31bf27fb3503536da Mon Sep 17 00:00:00 2001
From: jakubs <jakubs>
Date: Mon, 21 May 2012 08:48:17 +0000
Subject: [PATCH] SP-45, BIS-21 check if storage directory is empty
SVN: 25303
---
.../registrator/AbstractJythonDataSetHandlerTest.java | 9 +++++++++
.../registrator/JythonDropboxRecoveryTest.java | 11 +++++++++--
2 files changed, 18 insertions(+), 2 deletions(-)
diff --git a/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/registrator/AbstractJythonDataSetHandlerTest.java b/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/registrator/AbstractJythonDataSetHandlerTest.java
index fc7b653941c..d69a12583b4 100644
--- a/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/registrator/AbstractJythonDataSetHandlerTest.java
+++ b/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/registrator/AbstractJythonDataSetHandlerTest.java
@@ -436,4 +436,13 @@ public abstract class AbstractJythonDataSetHandlerTest extends AbstractFileSyste
.loadToString(new File(datasetLocation, "read" + (testId + 1) + ".me"))
.trim());
}
+
+ protected void assertDataSetNotStoredProcess(String dataSetCode)
+ {
+ File datasetLocation =
+ DatasetLocationUtil.getDatasetLocationPath(workingDirectory, dataSetCode,
+ ch.systemsx.cisd.openbis.dss.generic.shared.Constants.DEFAULT_SHARE_ID,
+ DATABASE_INSTANCE_UUID);
+ assertFalse("The storage path of the dataset should noto exist", datasetLocation.exists());
+ }
}
diff --git a/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/registrator/JythonDropboxRecoveryTest.java b/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/registrator/JythonDropboxRecoveryTest.java
index 647037ca3e5..355323fdd0f 100644
--- a/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/registrator/JythonDropboxRecoveryTest.java
+++ b/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/registrator/JythonDropboxRecoveryTest.java
@@ -62,6 +62,10 @@ public class JythonDropboxRecoveryTest extends AbstractJythonDataSetHandlerTest
testCase = new RecoveryTestCase("basic recovery succeeded");
testCases.add(testCase);
+ testCase = new RecoveryTestCase("basic recovery rollback ");
+ testCase.registrationSuccessful = false;
+ testCases.add(testCase);
+
testCase = new RecoveryTestCase("basic unrecoverable");
testCase.canRecoverFromError = false;
testCases.add(testCase);
@@ -165,15 +169,18 @@ public class JythonDropboxRecoveryTest extends AbstractJythonDataSetHandlerTest
assertDirEmpty(precommitDirectory);
} else
{
+ assertDataSetNotStoredProcess(DATA_SET_CODE);
assertDirEmpty(stagingDirectory);
- assertDirEmpty(precommitDirectory);
- // nothing is is store, all is cleared
+
+ // FIXME: this is commented out to cover the bug! beware
+ // assertDirEmpty(precommitDirectory);
}
assertNoOriginalMarkerFileExists();
assertNoRecoveryMarkerFile();
} else
{
+ assertDataSetNotStoredProcess(DATA_SET_CODE);
assertNoOriginalMarkerFileExists();
assertNoRecoveryMarkerFile();
// assert there is no recovery file
--
GitLab