0001-workflows-only-log-condition-errors-as-functional-er.patch

Thomas Noël, 12 juin 2018 16:51

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

Subject: [PATCH] workflows: only log condition errors as functional errors
 (#24472)

 tests/test_form_pages.py |  3 ++-
 tests/test_workflows.py  | 50 +++++++++++++++++++++++++++++++++++++++-
 wcs/conditions.py        | 13 +++++++++--
 wcs/logged_errors.py     |  2 +-
 wcs/wf/jump.py           |  3 ++-
 wcs/workflows.py         |  3 ++-
 6 files changed, 67 insertions(+), 7 deletions(-)

         assert LoggedError.count() == 1
         error = LoggedError.get_on_index(
                 '34-12-None-None-zerodivisionerror-integer-division-or-modulo-by-zero', 'tech_id')
             '34-12-just_submitted-_jump-failed-to-evaluate-condition-10-python-integer-division-or-modulo-by-zero-zerodivisionerror',
             'tech_id')
         assert error.occurences_count == 2
         assert len(LoggedError.get_ids_with_indexed_value('formdef_id', '34')) == 1

     from wcs import sessions
     from wcs.fields import (StringField, DateField, MapField, FileField, ItemField,
             ItemsField, CommentField)
     from wcs.logged_errors import LoggedError
     from wcs.roles import Role
     from wcs.workflows import (Workflow, WorkflowStatusItem,
             SendmailWorkflowStatusItem, SendSMSWorkflowStatusItem,
-...
                 'value': 'utils.time_delta(utils.time.localtime(), "2015-01-04").days > 0'}
         assert item.must_jump(formdata) is True
     def test_jump_count_condition(pub):
         FormDef.wipe()
         formdef = FormDef()
-...
         item.condition = {'type': 'python', 'value': 'form_objects.count < 2'}
         assert item.must_jump(formdata) is False
     def test_jump_bad_python_condition(pub):
         FormDef.wipe()
         formdef = FormDef()
         formdef.name = 'foobar'
         formdef.store()
         pub.substitutions.feed(formdef)
         formdef.data_class().wipe()
         formdata = formdef.data_class()()
         item = JumpWorkflowStatusItem()
         LoggedError.wipe()
         item.condition = {'type': 'python', 'value': 'form_var_foobar == 0'}
         assert item.must_jump(formdata) is False
         assert LoggedError.count() == 1
         logged_error = LoggedError.select()[0]
         assert logged_error.summary.startswith('Failed to evaluate condition')
         assert 'form_var_foobar == 0' in logged_error.summary
         assert "name 'form_var_foobar' is not defined" in logged_error.summary
         LoggedError.wipe()
         item.condition = {'type': 'python', 'value': '~ invalid ~'}
         assert item.must_jump(formdata) is False
         assert LoggedError.count() == 1
         logged_error = LoggedError.select()[0]
         assert logged_error.summary.startswith('Failed to evaluate condition')
         assert '~ invalid ~' in logged_error.summary
         assert 'unexpected EOF while parsing' in logged_error.summary
     def test_jump_django_conditions(pub):
         FormDef.wipe()
         formdef = FormDef()
-...
         pub.substitutions.feed(formdata)
         item = JumpWorkflowStatusItem()
         LoggedError.wipe()
         item.condition = {'type': 'django', 'value': '1 < 2'}
         assert item.must_jump(formdata) is True
-...
         item.condition = {'type': 'django', 'value': 'form_var_foo|first|upper == "X"'}
         assert item.must_jump(formdata) is False
         assert LoggedError.count() == 0
         item.condition = {'type': 'django', 'value': '~ invalid ~'}
         assert item.must_jump(formdata) is False
         assert LoggedError.count() == 1
         logged_error = LoggedError.select()[0]
         assert logged_error.summary.startswith('Failed to evaluate condition')
         assert '~ invalid ~' in logged_error.summary
         assert "Could not parse the remainder: '~' from '~'" in logged_error.summary
     def test_check_auth(pub):
         user = pub.user_class(name='foo')
-...
         choice.condition = {'type': 'python', 'value': 'form_name == "baz"'}
         workflow.store()
         assert len(FormDef.get(formdef.id).data_class().get_actionable_ids([role.id])) == 2
         # bad condition
         LoggedError.wipe()
         choice.condition = {'type': 'python', 'value': 'foobar == barfoo'}
         workflow.store()
         assert len(FormDef.get(formdef.id).data_class().get_actionable_ids([role.id])) == 0
         assert LoggedError.count() == 1
         logged_error = LoggedError.select()[0]
         assert logged_error.occurences_count > 1  # should be 2... == 12 with pickle, 4 with sql
         assert logged_error.summary.startswith('Failed to evaluate condition')
         assert 'foobar == barfoo' in logged_error.summary
         assert "name 'foobar' is not defined" in logged_error.summary

         record_errors = True
         log_errors = False
         def __init__(self, condition, context=None):
         def __init__(self, condition, context={}):
             if not condition:
                 condition = {}
             self.type = condition.get('type')
-...
                 if self.log_errors:
                     get_logger().warn('failed to evaluate %r (%r)', self, e)
                 if self.record_errors:
                     get_publisher().notify_of_exception(sys.exc_info())
                     from wcs.logged_errors import LoggedError
                     message = '%s (%s)' % (e, e.__class__.__name__)
                     summary = _('Failed to evaluate condition "%(value)s" (%(type)s): %(message)s') % {
                         'value': self.value,
                         'type': self.type,
                         'message': message,
+                    }
                     LoggedError.record(summary,
                                        formdata=self.context.get('formdata'),
                                        status_item=self.context.get('status_item'))
                 raise RuntimeError()
         def evaluate_python(self, local_variables):

             if status_item:
                 error.status_item_id = status_item.id
                 if status_item.parent:
                 if getattr(status_item, 'parent', None):
                     error.status_id = status_item.parent.id
             if status:
                 error.status_id = status.id

             must_jump = True
             if self.condition:
                 context = {'formdata': formdata, 'status_item': self}
                 try:
                     must_jump = Condition(self.condition).evaluate()
                     must_jump = Condition(self.condition, context).evaluate()
                 except RuntimeError:
                     must_jump = False

             return False
         def check_condition(self, formdata):
             context = {'formdata': formdata, 'status_item': self}
             try:
                 return Condition(self.condition).evaluate()
                 return Condition(self.condition, context).evaluate()
             except RuntimeError:
                 return False
+    -

Projet

Général

Profil

Produits Entr'ouvert » w.c.s.

0001-workflows-only-log-condition-errors-as-functional-er.patch