From bee6286a85746f4059bb73016b2dfa23ed4f9970 Mon Sep 17 00:00:00 2001
From: felmer <franz-josef.elmer@id.ethz.ch>
Date: Tue, 25 Sep 2018 08:52:24 +0200
Subject: [PATCH] SSDM-7190: bug fixed in integration test openbis_sync
---
integration-tests/source/systemtest/testcase.py | 7 ++++++-
integration-tests/test_openbis_sync.py | 1 +
2 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/integration-tests/source/systemtest/testcase.py b/integration-tests/source/systemtest/testcase.py
index 98057ed3285..7412d672e7e 100644
--- a/integration-tests/source/systemtest/testcase.py
+++ b/integration-tests/source/systemtest/testcase.py
@@ -696,13 +696,18 @@ class OpenbisController(_Controller):
destination = "%s/%s" % (corePluginsFolder, self.instanceName)
shutil.rmtree(destination, ignore_errors=True)
shutil.copytree("%s/core-plugins/%s" % (self.templatesFolder, self.instanceName), destination)
+ self.enableCorePlugin(self.instanceName)
+
+ def enableCorePlugin(self, pluginName):
+ corePluginsFolder = "%s/servers/core-plugins" % self.installPath
corePluginsPropertiesFile = "%s/core-plugins.properties" % corePluginsFolder
corePluginsProperties = util.readProperties(corePluginsPropertiesFile)
enabledModules = corePluginsProperties['enabled-modules']
- enabledModules = "%s, %s" % (enabledModules, self.instanceName) if len(enabledModules) > 0 else self.instanceName
+ enabledModules = "%s, %s" % (enabledModules, pluginName) if len(enabledModules) > 0 else pluginName
corePluginsProperties['enabled-modules'] = enabledModules
util.writeProperties(corePluginsPropertiesFile, corePluginsProperties)
+
def _setUpStore(self):
templateStore = "%s/stores/%s" % (self.templatesFolder, self.instanceName)
if os.path.isdir(templateStore):
diff --git a/integration-tests/test_openbis_sync.py b/integration-tests/test_openbis_sync.py
index 834850e86a2..dd308f36c1c 100755
--- a/integration-tests/test_openbis_sync.py
+++ b/integration-tests/test_openbis_sync.py
@@ -53,6 +53,7 @@ class TestCase(systemtest.testcase.TestCase):
openbis1.createTestDatabase('openbis')
openbis1.createTestDatabase('pathinfo')
openbis1.createTestDatabase('imaging')
+ openbis1.enableCorePlugin("openbis-sync")
'''Copy master data script'''
filePath = "%s/servers/core-plugins/%s/1/as" % (openbis1.installPath, openbis1.instanceName)
--
GitLab