0003-formdefs-report-all-missing-things-in-one-time-57753.patch

Lauréline Guérin, 04 novembre 2021 14:51

Voir les différences: en ligne côte à côte

Subject: [PATCH 3/4] formdefs: report all missing things in one time (#57753)

 tests/test_formdef_import.py  | 30 ++++++++++++++++++++++++++++--
 tests/test_workflow_import.py | 16 ++++++++++++----
 wcs/formdef.py                | 15 ++++++++++-----
 3 files changed, 50 insertions(+), 11 deletions(-)

         formdef.fields = [fields.StringField(id='1', type='string', data_source={'type': 'foobar'})]
         export = ET.tostring(export_to_indented_xml(formdef))
         with pytest.raises(FormdefImportError, match='Unknown datasources'):
         with pytest.raises(FormdefImportError) as excinfo:
             FormDef.import_from_xml(io.BytesIO(export))
         assert excinfo.value.msg == 'Unknown referenced objects'
         assert excinfo.value.details == 'Unknown datasources: foobar'
         # carddef as datasource
         carddef = CardDef()
-...
         BlockDef.wipe()
         export = ET.tostring(export_to_indented_xml(formdef))
         with pytest.raises(FormdefImportError, match='Unknown field type'):
         with pytest.raises(FormdefImportError) as excinfo:
             FormDef.import_from_xml(io.BytesIO(export))
         assert excinfo.value.msg == 'Unknown referenced objects'
         assert excinfo.value.details == 'Unknown field types: block:foobar'
     def test_duplicated_field_ids(pub):
-...
         assert custom_views[0].order_by == 'receipt_time'
         assert custom_views[0].formdef_id == formdef2.id
         assert custom_views[0].formdef_type == 'formdef'
     def test_import_formdef_multiple_errors(pub):
         BlockDef.wipe()
         formdef = FormDef()
         formdef.name = 'foo'
         formdef.fields = [
             fields.BlockField(id='1', type='block:foobar'),
             fields.BlockField(id='2', type='block:foobaz'),
             fields.StringField(id='3', type='string', data_source={'type': 'foobar'}),
             fields.StringField(id='4', type='string', data_source={'type': 'carddef:unknown'}),
+        ]
         export = ET.tostring(export_to_indented_xml(formdef))
         with pytest.raises(FormdefImportError) as excinfo:
             FormDef.import_from_xml(io.BytesIO(export))
         assert excinfo.value.msg == 'Unknown referenced objects'
         assert (
             excinfo.value.details
             == 'Unknown field types: block:foobar, block:foobaz; Unknown datasources: carddef:unknown, foobar'
+        )

         for wf in [wf1, wf2, wf3]:
             export = ET.tostring(export_to_indented_xml(wf))
             with pytest.raises(WorkflowImportError, match='Unknown datasources'):
             with pytest.raises(WorkflowImportError) as excinfo:
                 Workflow.import_from_xml(io.BytesIO(export))
             assert excinfo.value.msg == 'Unknown referenced objects'
             assert excinfo.value.details == 'Unknown datasources: foobar'
         # carddef as datasource
         CardDef.wipe()
-...
         for wf in [wf1, wf2, wf3]:
             export = ET.tostring(export_to_indented_xml(wf))
             with pytest.raises(WorkflowImportError, match='Unknown datasources'):
             with pytest.raises(WorkflowImportError) as excinfo:
                 Workflow.import_from_xml(io.BytesIO(export))
             assert excinfo.value.msg == 'Unknown referenced objects'
             assert excinfo.value.details == 'Unknown datasources: carddef:unknown'
         # carddef custom view as datasource
         pub.custom_view_class.wipe()
-...
         for wf in [wf1, wf2, wf3]:
             export = ET.tostring(export_to_indented_xml(wf))
             with pytest.raises(WorkflowImportError, match='Unknown datasources'):
             with pytest.raises(WorkflowImportError) as excinfo:
                 Workflow.import_from_xml(io.BytesIO(export))
             assert excinfo.value.msg == 'Unknown referenced objects'
             assert excinfo.value.details == 'Unknown datasources: carddef:foo:unknown'
     def test_workflow_with_block(pub):
-...
         BlockDef.wipe()
         for wf in [wf1, wf2, wf3]:
             export = ET.tostring(export_to_indented_xml(wf))
             with pytest.raises(WorkflowImportError, match='Unknown field type'):
             with pytest.raises(WorkflowImportError) as excinfo:
                 Workflow.import_from_xml(io.BytesIO(export))
             assert excinfo.value.msg == 'Unknown referenced objects'
             assert excinfo.value.details == 'Unknown field types: block:foobar'
     def test_workflow_with_category(pub):

                 setattr(formdef, boolean_attribute, value.text == 'true')
             formdef.fields = []
             unknown_field_types = set()
             for i, field in enumerate(tree.find('fields')):
                 try:
                     field_o = fields.get_field_class_by_type(field.findtext('type'))()
                 except KeyError:
                     raise FormdefImportError(_('Unknown field type'), details=field.findtext('type'))
                     unknown_field_types.add(field.findtext('type'))
                     continue
                 field_o.init_with_xml(field, charset, include_id=True)
                 if fix_on_error or not field_o.id:
                     # this assumes all fields will have id, or none of them
-...
                     value = xml_node_text(child)
                     formdef.digest_templates[key] = value
             unknown_datasources = set()
             if check_datasources:
                 # check if datasources are defined
                 unknown_datasources = set()
                 for field in formdef.fields:
                     data_source = getattr(field, 'data_source', None)
                     if data_source:
-...
                             except IndexError:
                                 unknown_datasources.add(data_source_id)
             if unknown_field_types or unknown_datasources:
                 details = []
                 if unknown_field_types:
                     details.append('%s: %s' % (_('Unknown field types'), ', '.join(sorted(unknown_field_types))))
                 if unknown_datasources:
                     raise FormdefImportError(
                         _('Unknown datasources'), details=', '.join(sorted(unknown_datasources))
+                    )
                     details.append('%s: %s' % (_('Unknown datasources'), ', '.join(sorted(unknown_datasources))))
                 raise FormdefImportError(_('Unknown referenced objects'), details='; '.join(details))
             return formdef
+    -

Projet

Général

Profil

Produits Entr'ouvert » w.c.s.

0003-formdefs-report-all-missing-things-in-one-time-57753.patch