From c2eab4df5caebb2063fa5735f4acffb040f124cf Mon Sep 17 00:00:00 2001
From: Antti Luomi <antti.luomi@id.ethz.ch>
Date: Mon, 13 Aug 2018 16:13:05 +0200
Subject: [PATCH] SSDM-6700: Integration test openBIS sync fails
---
.../sync/common/MasterDataExtractor.java | 20 +++++++++----------
integration-tests/test_openbis_sync.py | 4 ++--
2 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/datastore_server/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/common/MasterDataExtractor.java b/datastore_server/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/common/MasterDataExtractor.java
index 25602431e23..9a9f2ea10f7 100644
--- a/datastore_server/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/common/MasterDataExtractor.java
+++ b/datastore_server/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/common/MasterDataExtractor.java
@@ -190,8 +190,10 @@ public class MasterDataExtractor
{
String code =
(propertyTypeImmutable.isInternalNamespace()
- && propertyTypeImmutable.getCode().startsWith(INTERNAL_NAMESPACE_PREFIX)) ? CodeConverter.tryToDatabase(propertyTypeImmutable
- .getCode()) : propertyTypeImmutable.getCode();
+ && propertyTypeImmutable.getCode().startsWith(INTERNAL_NAMESPACE_PREFIX))
+ ? CodeConverter.tryToDatabase(propertyTypeImmutable
+ .getCode())
+ : propertyTypeImmutable.getCode();
Element propertyTypeElement = doc.createElement("xmd:propertyType");
propertyTypeElement.setAttribute("code", code);
propertyTypeElement.setAttribute("label", propertyTypeImmutable.getLabel());
@@ -202,14 +204,12 @@ public class MasterDataExtractor
if (propertyTypeImmutable.getDataType().name().equals(DataType.CONTROLLEDVOCABULARY.name()))
{
propertyTypeElement.setAttribute("vocabulary", propertyTypeImmutable.getVocabulary().getCode());
- }
- else if (propertyTypeImmutable.getDataType().name().equals(DataType.MATERIAL.name()))
+ } else if (propertyTypeImmutable.getDataType().name().equals(DataType.MATERIAL.name()))
{
if (propertyTypeImmutable.getMaterialType() != null)
{
propertyTypeElement.setAttribute("material", propertyTypeImmutable.getMaterialType().getCode());
- }
- else
+ } else
{
// for properties like "inhibitor_of" where it is of Material of Any Type
propertyTypeElement.setAttribute("material", "");
@@ -231,7 +231,7 @@ public class MasterDataExtractor
Element vocabElement = doc.createElement("xmd:controlledVocabulary");
String code = vocabImmutable.isInternalNamespace()
&& vocabImmutable.getCode().startsWith(INTERNAL_NAMESPACE_PREFIX) ? CodeConverter.tryToDatabase(vocabImmutable.getCode())
- : vocabImmutable.getCode();
+ : vocabImmutable.getCode();
vocabElement.setAttribute("code", code);
vocabElement.setAttribute("description", vocabImmutable.getDescription());
vocabElement.setAttribute("urlTemplate", vocabImmutable.getUrlTemplate());
@@ -307,7 +307,8 @@ public class MasterDataExtractor
{
Element experimentTypeElement = getEntityTypeXML(doc, expType, "xmd:collectionType");
experimentTypeElement.setAttribute("description", expType.getDescription());
- experimentTypesElement.setAttribute("validationPlugin", expType.getValidationScript()!= null ? expType.getValidationScript().getName() : "");
+ experimentTypesElement.setAttribute("validationPlugin",
+ expType.getValidationScript() != null ? expType.getValidationScript().getName() : "");
experimentTypesElement.appendChild(experimentTypeElement);
Element propertyAssignmentsElement = getPropertyAssignmentXML(doc, expTypeCodePropAssignmentMap.get(expType.getCode()));
experimentTypeElement.appendChild(propertyAssignmentsElement);
@@ -358,8 +359,7 @@ public class MasterDataExtractor
{
Element propertyAssignmentElement = doc.createElement("xmd:propertyAssignment");
propertyAssignmentsElement.appendChild(propertyAssignmentElement);
- propertyAssignmentElement.setAttribute("propertyTypeCode", CodeConverter.tryToBusinessLayer(propAssignment.getPropertyType().getCode(),
- propAssignment.getPropertyType().isInternalNameSpace()));
+ propertyAssignmentElement.setAttribute("propertyTypeCode", propAssignment.getPropertyType().getCode());
propertyAssignmentElement.setAttribute("ordinal", String.valueOf(propAssignment.getOrdinal()));
propertyAssignmentElement.setAttribute("section", propAssignment.getSection());
propertyAssignmentElement.setAttribute("showInEdit", String.valueOf(propAssignment.isShowInEditView()));
diff --git a/integration-tests/test_openbis_sync.py b/integration-tests/test_openbis_sync.py
index b7fc3a26f95..d12810ad649 100755
--- a/integration-tests/test_openbis_sync.py
+++ b/integration-tests/test_openbis_sync.py
@@ -294,7 +294,7 @@ class TestCase(systemtest.testcase.TestCase):
base64string = base64.encodestring('%s:%s' % (user, password)).replace('\n', '')
request.add_header("Authorization", "Basic %s" % base64string)
data = urllib.urlencode({'mode' : 'test'})
- response = urllib2.urlopen(request, data)
+ response = urllib2.urlopen(request, data, context=ssl._create_unverified_context())
return response
def installPlugin(self, openbisController, plugin_name):
@@ -363,4 +363,4 @@ class GitLabArtifactRepository(GitArtifactRepository):
with open('targets/sissource_private-token.txt', 'r') as f:
return f.readline().strip()
-TestCase(settings, __file__).runTest()
\ No newline at end of file
+TestCase(settings, __file__).runTest()
--
GitLab