From a432d48b6113d6b00388f472b2f71bafff820a53 Mon Sep 17 00:00:00 2001
From: felmer <felmer>
Date: Mon, 2 Feb 2015 09:57:30 +0000
Subject: [PATCH] integration test for multi data set archiving uses
GroupingPolicy
SVN: 33367
---
.../1/dss/maintenance-tasks/auto-archiver/plugin.properties | 3 ++-
integration-tests/test_multi_data_set_archiving.py | 1 +
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/integration-tests/templates/test_multi_data_set_archiving/core-plugins/openbis/1/dss/maintenance-tasks/auto-archiver/plugin.properties b/integration-tests/templates/test_multi_data_set_archiving/core-plugins/openbis/1/dss/maintenance-tasks/auto-archiver/plugin.properties
index efbc7a2436c..55e6843f831 100644
--- a/integration-tests/templates/test_multi_data_set_archiving/core-plugins/openbis/1/dss/maintenance-tasks/auto-archiver/plugin.properties
+++ b/integration-tests/templates/test_multi_data_set_archiving/core-plugins/openbis/1/dss/maintenance-tasks/auto-archiver/plugin.properties
@@ -2,6 +2,7 @@ class = ch.systemsx.cisd.etlserver.plugins.AutoArchiverTask
interval = 20
remove-datasets-from-store = true
older-than = 1
-policy.class = ch.systemsx.cisd.etlserver.plugins.ByExperimentPolicy
+policy.class = ch.systemsx.cisd.etlserver.plugins.GroupingPolicy
policy.minimal-archive-size = 1500000
policy.maximal-archive-size = 2500000
+policy.grouping-keys = DataSetType#Experiment, DataSetType#Project:merge
diff --git a/integration-tests/test_multi_data_set_archiving.py b/integration-tests/test_multi_data_set_archiving.py
index ea36a77d135..652da79fdff 100755
--- a/integration-tests/test_multi_data_set_archiving.py
+++ b/integration-tests/test_multi_data_set_archiving.py
@@ -242,6 +242,7 @@ class TestCase(systemtest.testcase.TestCase):
def _createArchivingMonitor(self, openbisController):
monitor = openbisController.createLogMonior()
monitor.addNotificationCondition(util.RegexCondition('OPERATION.AutoArchiverTask'))
+ monitor.addNotificationCondition(util.RegexCondition('GroupingPolicy'))
monitor.addNotificationCondition(util.RegexCondition('OPERATION.MultiDataSet'))
monitor.addNotificationCondition(util.RegexCondition('OPERATION.FileDeleter'))
monitor.addNotificationCondition(util.RegexCondition('OPERATION.DataSetCommandExecutor'))
--
GitLab