From ac0345525e24ec6791ae14a0c2025eaa908be8c7 Mon Sep 17 00:00:00 2001
From: gakin <gakin>
Date: Wed, 1 Mar 2017 12:46:13 +0000
Subject: [PATCH] SSDM-4847 : Add master data sync to the integration test
SVN: 37846
---
.../master_data/initialize-master-data.py | 2 +-
integration-tests/test_openbis_sync.py | 24 ++++++++++++++++---
2 files changed, 22 insertions(+), 4 deletions(-)
diff --git a/integration-tests/templates/test_openbis_sync/master_data/initialize-master-data.py b/integration-tests/templates/test_openbis_sync/master_data/initialize-master-data.py
index 0f252ad1bd1..b2789114057 100644
--- a/integration-tests/templates/test_openbis_sync/master_data/initialize-master-data.py
+++ b/integration-tests/templates/test_openbis_sync/master_data/initialize-master-data.py
@@ -22,7 +22,7 @@ vocabulary_term_GENDER_FEMALE.setLabel('FEMALE')
vocabulary_term_GENDER_FEMALE.setOrdinal(1)
vocabulary_GENDER.addTerm(vocabulary_term_GENDER_FEMALE)
-vocabulary_INTERNAL = tr.getOrCreateNewVocabulary('NTERNAL')
+vocabulary_INTERNAL = tr.getOrCreateNewVocabulary('INTERNAL')
vocabulary_INTERNAL.setDescription('Internal vocabulary')
vocabulary_INTERNAL.setUrlTemplate(None)
vocabulary_INTERNAL.setManagedInternally(False)
diff --git a/integration-tests/test_openbis_sync.py b/integration-tests/test_openbis_sync.py
index f7613284573..d0e1d4d4958 100755
--- a/integration-tests/test_openbis_sync.py
+++ b/integration-tests/test_openbis_sync.py
@@ -41,10 +41,17 @@ class TestCase(systemtest.testcase.TestCase):
openbis1.createTestDatabase('openbis')
openbis1.createTestDatabase('pathinfo')
openbis1.createTestDatabase('imaging')
-
+
'''Set openbis1 as the datasource'''
self.installDataSourcePlugin(openbis1, openbis1_dss_port)
self.installEntityRegistrationPlugin(openbis1)
+
+ '''Copy master data script'''
+ filePath = "%s/servers/core-plugins/%s/1/as" % (openbis1.installPath, openbis1.instanceName)
+ os.makedirs(filePath)
+ util.printAndFlush("Copying master data script from %s to %s" %(self.getMasterDataScriptFolder(), filePath ))
+ util.copyFromTo(self.getMasterDataScriptFolder(), filePath, "initialize-master-data.py")
+
corePluginsPropertiesFile = "%s/servers/core-plugins/core-plugins.properties" % openbis1.installPath
util.printAndFlush(corePluginsPropertiesFile)
openbis1.allUp()
@@ -115,6 +122,13 @@ class TestCase(systemtest.testcase.TestCase):
openbis1.setDummyAuthentication()
self.installDataSourcePlugin(openbis1, openbis1_dss_port)
self.installEntityRegistrationPlugin(openbis1)
+
+ '''Copy master data script'''
+ filePath = "%s/servers/core-plugins/%s/1/as" % (openbis1.installPath, openbis1.instanceName)
+ os.makedirs(filePath)
+ util.printAndFlush("Copying master data script from %s to %s" %(self.getMasterDataScriptFolder(), filePath ))
+ util.copyFromTo(self.getMasterDataScriptFolder(), filePath, "initialize-master-data.py")
+
corePluginsPropertiesFile = "%s/servers/core-plugins/core-plugins.properties" % openbis1.installPath
util.printAndFlush(corePluginsPropertiesFile)
#util.writeProperties(corePluginsPropertiesFile)
@@ -122,7 +136,8 @@ class TestCase(systemtest.testcase.TestCase):
openbis1.setDataStoreServerProperty("host-address", "https://localhost")
openbis1.allUp()
- '''uncomment the following if we have ot run the test once in non-dev mode before (otherwise we already have ENTITY_REGISTRATION and get an error'''
+
+ '''uncomment the following if we have not run the test once in non-dev mode before (otherwise we already have ENTITY_REGISTRATION and get an error'''
# '''Drop the folder to register some test entities in space SYNC'''
# openbis1.dropAndWait("ENTITY_REGISTRATION", "openbis-sync-entity-reg")
@@ -230,12 +245,15 @@ class TestCase(systemtest.testcase.TestCase):
def installEntityRegistrationPlugin(self, openbisController):
self.installPlugin(openbisController, "test")
-
+
def installHarvesterPlugin(self, openbisController):
self.installPlugin(openbisController, "harvester")
def getHarvesterConfigFolder(self):
return systemtest.testcase.TEMPLATES + "/" + self.name + "/harvester_config"
+
+ def getMasterDataScriptFolder(self):
+ return systemtest.testcase.TEMPLATES + "/" + self.name + "/master_data"
class GitLabArtifactRepository(GitArtifactRepository):
"""
--
GitLab