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

Thomas Noël, 29 juin 2018 15:02

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

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

 tests/test_backoffice_pages.py |  9 +++---
 tests/test_form_pages.py       |  3 +-
 tests/test_workflows.py        | 54 +++++++++++++++++++++++++++++++++-
 wcs/admin/logged_errors.py     |  8 +++++
 wcs/conditions.py              | 11 +++++--
 wcs/logged_errors.py           | 21 ++++++++++---
 wcs/wf/jump.py                 |  3 +-
 wcs/workflows.py               |  3 +-
 8 files changed, 98 insertions(+), 14 deletions(-)

         app = login(get_app(pub))
         resp = app.get('/backoffice/forms/%s/' % formdef.id)
         assert 'ZeroDivisionError' in resp.body
         assert 'Failed to evaluate condition (error ZeroDivisionError)' in resp.body
         resp = resp.click('1 error')
         resp = app.get('/backoffice/workflows/%s/' % workflow.id)
         resp2 = resp.click('1 error')
         assert 'ZeroDivisionError' in resp2.body
         assert 'Failed to evaluate condition (error ZeroDivisionError)' in resp2.body
         resp = resp2.click('ZeroDivisionError')
         assert 'integer division or modulo by zero' in resp.body
         assert 'ZeroDivisionError: integer division or modulo by zero' in resp.body
         assert 'Expression (type python): <pre>1/0</pre>' in resp.body
         assert not 'Acked' in resp.body
         resp = resp.click('Ack').follow()
         assert 'Acked' in resp.body
-...
         app = login(get_app(pub))
         resp = app.get('/backoffice/workflows/%s/' % workflow.id)
         assert 'ZeroDivisionError' in resp.body
         assert 'Failed to evaluate condition (error ZeroDivisionError)' in resp2.body
         resp2 = resp.click('1 error')
         resp = resp2.click('ZeroDivisionError')
         assert 'href="http://example.net/backoffice/management/test/' in resp.body

         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-error-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 == 'Failed to evaluate condition (error NameError)'
         assert logged_error.error_message == "NameError: name 'form_var_foobar' is not defined"
         assert logged_error.expression == 'form_var_foobar == 0'
         assert logged_error.expression_type == 'python'
         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 == 'Failed to evaluate condition (error SyntaxError)'
         assert logged_error.error_message == "SyntaxError: unexpected EOF while parsing (<string>, line 1)"
         assert logged_error.expression == '~ invalid ~'
         assert logged_error.expression_type == 'python'
     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 == 'Failed to evaluate condition (error TemplateSyntaxError)'
         assert logged_error.error_message == "TemplateSyntaxError: Could not parse the remainder: '~' from '~'"
         assert logged_error.expression == '~ invalid ~'
         assert logged_error.expression_type == 'django'
     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 == 'Failed to evaluate condition (error NameError)'
         assert logged_error.error_message == "NameError: name 'foobar' is not defined"
         assert logged_error.expression == 'foobar == barfoo'
         assert logged_error.expression_type == 'python'

                                 _(status_item.description))
                     r += htmltext('</ul>')
             if self.error.expression or self.error.expression_type:
                 r += htmltext('  <li>%s <pre>%s</pre></li>') % (
                         _('Expression (type %s):') % self.error.expression_type,
                         self.error.expression)
             if self.error.error_message:
                 r += htmltext('  <li>%s %s</li>') % (_('Error message:'), self.error.error_message)
             if formdef:
                 formdata = self.error.get_formdata()
                 if formdata:

         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
                     summary = _('Failed to evaluate condition (error %s)' % e.__class__.__name__)
                     LoggedError.record(summary,
                                        formdata=self.context.get('formdata'),
                                        status_item=self.context.get('status_item'),
                                        expression=self.value,
                                        expression_type=self.type,
                                        error_message='%s: %s' % (e.__class__.__name__, e))
                 raise RuntimeError()
         def evaluate_python(self, local_variables):

         workflow_id = None
         status_id = None
         status_item_id = None
         expression = None
         expression_type = None
         error_message = None
         traceback = None
         occurences_count = 0
         first_occurence_timestamp = None
-...
         # declarations for serialization
         XML_NODES = [
                 ('summary', 'str'), ('traceback', 'str'),
                 ('expression', 'str'), ('expression_type', 'str'), ('error_message', 'str'),
                 ('formdata_id', 'str'), ('formdef_id', 'str'), ('workflow_id', 'str'),
                 ('status_id', 'str'), ('status_item_id', 'str'),
                 ('occurences_count', 'int'),
-...
         @classmethod
         def record(cls, error_summary, plain_error_msg=None, formdata=None,
                    formdef=None, workflow=None, status=None, status_item=None):
                    formdef=None, workflow=None, status=None, status_item=None,
                    expression=None, expression_type=None, error_message=None):
             error = cls()
             error.summary = error_summary
             error.traceback = plain_error_msg
             error.expression = expression
             error.expression_type = expression_type
             error.error_message = error_message
             if formdata:
                 error.formdata_id = str(formdata.id)
-...
             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
-...
         @property
         def tech_id(self):
             return ('%s-%s-%s-%s-%s' % (self.formdef_id, self.workflow_id, self.status_id,
                                         self.status_item_id, simplify(self.summary)))[:200]
             tech_id = '%s-%s-' % (self.formdef_id, self.workflow_id)
             if self.status_id:
                 tech_id += '%s-' % self.status_id
             if self.status_item_id:
                 tech_id += '%s-' % self.status_item_id
             tech_id += '%s' % simplify(self.summary)
             return tech_id[:200]
         def get_formdef(self):
             return FormDef.get(self.formdef_id, ignore_errors=True)

             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