From eb95a846e7b309dd4a5978acba43f9500cddf7cf Mon Sep 17 00:00:00 2001 From: juanf <juanf> Date: Fri, 14 Aug 2015 11:46:44 +0000 Subject: [PATCH] SSDM-2329 : Do not shuffle recently deleted data sets - Take 2 SVN: 34455 --- .../ch/systemsx/cisd/etlserver/plugins/SimpleShufflingTest.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/plugins/SimpleShufflingTest.java b/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/plugins/SimpleShufflingTest.java index 89ee86bec32..a011f9309f7 100644 --- a/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/plugins/SimpleShufflingTest.java +++ b/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/plugins/SimpleShufflingTest.java @@ -223,6 +223,7 @@ public class SimpleShufflingTest extends AbstractFileSystemTestCase { allowing(service).listPhysicalDataSets(); will(returnValue(Arrays.asList(ds1, ds2, ds3, ds4))); + allowing(service).isDataSetOnTrashCanOrDeleted(ds3.getDataSetCode()); one(logger).log(LogLevel.INFO, "BEGIN Computing number of data sets to be moved for share 1"); one(logger).log(LogLevel.INFO, @@ -246,6 +247,7 @@ public class SimpleShufflingTest extends AbstractFileSystemTestCase one(shareIdManager).getShareId(ds2.getDataSetCode()); will(returnValue(ds2.getDataSetShareId())); + allowing(service).isDataSetOnTrashCanOrDeleted(ds2.getDataSetCode()); one(dataSetMover).moveDataSetToAnotherShare( new File(share1.getShare(), STORE_PATH + "ds2"), share4.getShare(), null, logger); -- GitLab