Commit ea2af2de authored by Martin Manchev's avatar Martin Manchev

Merge remote-tracking branch 'upstream/master' into coding-styles

parents 76255fb0 5782850e
portal = context.getPortalObject() portal = context.getPortalObject()
portal.DataLake_stopIngestionList() portal.ERP5Site_stopIngestionListForDataLake()
portal.DataLake_createDataAnalysisList() portal.ERP5Site_createDataAnalysisListForDataLake()
portal.DataLake_executeDataAnalysisList() portal.ERP5Site_executeDataAnalysisListForDataLake()
...@@ -54,7 +54,7 @@ ...@@ -54,7 +54,7 @@
</item> </item>
<item> <item>
<key> <string>id</string> </key> <key> <string>id</string> </key>
<value> <string>ERP5Site_stopIngestionList</string> </value> <value> <string>ERP5Site_createDataAnalysisListForDataLake</string> </value>
</item> </item>
</dictionary> </dictionary>
</pickle> </pickle>
......
...@@ -54,7 +54,7 @@ ...@@ -54,7 +54,7 @@
</item> </item>
<item> <item>
<key> <string>id</string> </key> <key> <string>id</string> </key>
<value> <string>ERP5Site_executeDataAnalysisList</string> </value> <value> <string>ERP5Site_executeDataAnalysisListForDataLake</string> </value>
</item> </item>
</dictionary> </dictionary>
</pickle> </pickle>
......
...@@ -54,7 +54,7 @@ ...@@ -54,7 +54,7 @@
</item> </item>
<item> <item>
<key> <string>id</string> </key> <key> <string>id</string> </key>
<value> <string>ERP5Site_createDataAnalysisList</string> </value> <value> <string>ERP5Site_stopIngestionListForDataLake</string> </value>
</item> </item>
</dictionary> </dictionary>
</pickle> </pickle>
......
...@@ -181,7 +181,7 @@ class TestDataIngestion(SecurityTestCase): ...@@ -181,7 +181,7 @@ class TestDataIngestion(SecurityTestCase):
self.tic() self.tic()
# call explicitly alarm so all 4 Data Streams are validated and published # call explicitly alarm so all 4 Data Streams are validated and published
self.portal.portal_alarms.wendelin_handle_analysis.Alarm_handleAnalysis() self.portal.portal_alarms.wendelin_data_lake_handle_analysis.Alarm_dataLakeHandleAnalysis()
self.tic() self.tic()
# check resulting Data Streams # check resulting Data Streams
...@@ -306,7 +306,7 @@ class TestDataIngestion(SecurityTestCase): ...@@ -306,7 +306,7 @@ class TestDataIngestion(SecurityTestCase):
self.tic() self.tic()
# call explicitly alarm to process and validate the ingestion # call explicitly alarm to process and validate the ingestion
self.portal.portal_alarms.wendelin_handle_analysis.Alarm_handleAnalysis() self.portal.portal_alarms.wendelin_data_lake_handle_analysis.Alarm_dataLakeHandleAnalysis()
self.tic() self.tic()
ingestion_reference = self.REF_DATASET + self.REFERENCE_SEPARATOR + reference + self.CSV ingestion_reference = self.REF_DATASET + self.REFERENCE_SEPARATOR + reference + self.CSV
...@@ -329,9 +329,9 @@ class TestDataIngestion(SecurityTestCase): ...@@ -329,9 +329,9 @@ class TestDataIngestion(SecurityTestCase):
Check all data analysis and data transformations are well configured Check all data analysis and data transformations are well configured
""" """
# call two times the alarm (1. create analysis 2. run analysis) # call two times the alarm (1. create analysis 2. run analysis)
self.portal.portal_alarms.wendelin_handle_analysis.Alarm_handleAnalysis() self.portal.portal_alarms.wendelin_data_lake_handle_analysis.Alarm_dataLakeHandleAnalysis()
self.tic() self.tic()
self.portal.portal_alarms.wendelin_handle_analysis.Alarm_handleAnalysis() self.portal.portal_alarms.wendelin_data_lake_handle_analysis.Alarm_dataLakeHandleAnalysis()
self.tic() self.tic()
def test_10_checkDataSetDataStreamRelation(self): def test_10_checkDataSetDataStreamRelation(self):
......
...@@ -6,12 +6,6 @@ ...@@ -6,12 +6,6 @@
</pickle> </pickle>
<pickle> <pickle>
<dictionary> <dictionary>
<item>
<key> <string>_recorded_property_dict</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</value>
</item>
<item> <item>
<key> <string>default_reference</string> </key> <key> <string>default_reference</string> </key>
<value> <string>testDataLakeIngestion</string> </value> <value> <string>testDataLakeIngestion</string> </value>
...@@ -45,10 +39,7 @@ ...@@ -45,10 +39,7 @@
<item> <item>
<key> <string>text_content_warning_message</string> </key> <key> <string>text_content_warning_message</string> </key>
<value> <value>
<tuple> <tuple/>
<string>W:106, 34: Unused variable \'i\' (unused-variable)</string>
<string>W:106, 76: Unused variable \'j\' (unused-variable)</string>
</tuple>
</value> </value>
</item> </item>
<item> <item>
...@@ -58,28 +49,13 @@ ...@@ -58,28 +49,13 @@
<item> <item>
<key> <string>workflow_history</string> </key> <key> <string>workflow_history</string> </key>
<value> <value>
<persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent> <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</value> </value>
</item> </item>
</dictionary> </dictionary>
</pickle> </pickle>
</record> </record>
<record id="2" aka="AAAAAAAAAAI="> <record id="2" aka="AAAAAAAAAAI=">
<pickle>
<global name="PersistentMapping" module="Persistence.mapping"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>data</string> </key>
<value>
<dictionary/>
</value>
</item>
</dictionary>
</pickle>
</record>
<record id="3" aka="AAAAAAAAAAM=">
<pickle> <pickle>
<global name="PersistentMapping" module="Persistence.mapping"/> <global name="PersistentMapping" module="Persistence.mapping"/>
</pickle> </pickle>
...@@ -92,7 +68,7 @@ ...@@ -92,7 +68,7 @@
<item> <item>
<key> <string>component_validation_workflow</string> </key> <key> <string>component_validation_workflow</string> </key>
<value> <value>
<persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent> <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
</value> </value>
</item> </item>
</dictionary> </dictionary>
...@@ -101,7 +77,7 @@ ...@@ -101,7 +77,7 @@
</dictionary> </dictionary>
</pickle> </pickle>
</record> </record>
<record id="4" aka="AAAAAAAAAAQ="> <record id="3" aka="AAAAAAAAAAM=">
<pickle> <pickle>
<global name="WorkflowHistoryList" module="Products.ERP5Type.Workflow"/> <global name="WorkflowHistoryList" module="Products.ERP5Type.Workflow"/>
</pickle> </pickle>
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment