0001-wscalls-don-t-crash-ezt-substitution-on-errors-in-we.patch

Frédéric Péters, 22 juillet 2016 11:42

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

Subject: [PATCH] wscalls: don't crash ezt substitution on errors in webservice
 call (#12701)

 tests/test_admin_pages.py | 26 ++++++++++++++++++++++++++
 tests/utilities.py        |  6 +++++-
 wcs/wscalls.py            |  6 ++++--
 3 files changed, 35 insertions(+), 3 deletions(-)

         assert FormDef.get(formdef_id).url_name == 'form-test'
         assert FormDef.get(formdef_id).table_name == 'xxx'
     def test_form_comment_with_error_in_wscall(pub):
         create_superuser(pub)
         NamedWsCall.wipe()
         wscall = NamedWsCall(name='xxx')
         wscall.description = 'description'
         wscall.request = {
                 'url': 'http://remote.example.net/404',
                 'request_signature_key': 'xxx',
                 'qs_data': {'a': 'b'},
                 'method': 'POST',
                 'post_data': {'c': 'd'},
+        }
         wscall.store()
         FormDef.wipe()
         formdef = FormDef()
         formdef.name = 'form title'
         formdef.fields = [fields.CommentField(id='1',
             label='x [webservice.xxx.foobar] x', type='comment')]
         formdef.store()
         app = login(get_app(pub))
         resp = app.get('/backoffice/forms/%s/' % formdef.id)
         assert 'x [webservice.xxx.foobar] x' in resp.body
     def test_workflows(pub):
         app = login(get_app(pub))
         app.get('/backoffice/workflows/')

     import pytest
     import shutil
     import threading
     import urlparse
     from wcs import sql
-...
                      'headers': headers,
                      'timeout': timeout})
             scheme, netloc, path, params, query, fragment = urlparse.urlparse(url)
             base_url = urlparse.urlunparse((scheme, netloc, path, '', '', ''))
             status, data, headers = {
                 'http://remote.example.net/204': (204, None, None),
                 'http://remote.example.net/400-json': (400, '{"err": 1, "err_desc": ":("}', None),
-...
                 'http://remote.example.net/json': (200, '{"foo": "bar"}', None),
                 'http://remote.example.net/xml': (200, '<?xml version="1.0"><foo/>',
                                                   {'content-type': 'text/xml'}),
                 }.get(url, (200, '', {}))
                 }.get(base_url, (200, '', {}))
             class FakeResponse(object):
                 def __init__(self, status, data, headers):

             (response, status, data) = call_webservice(**self.request)
             return json_loads(data)
     class WsCallsSubstitutionProxy(object):
         def __getattr__(self, attr):
             return NamedWsCall.get(attr).call()
             try:
                 return NamedWsCall.get(attr).call()
             except ValueError:
                 raise AttributeError()
     class WsCallRequestWidget(CompositeWidget):
+    -

Projet

Général

Profil

Produits Entr'ouvert » w.c.s.

0001-wscalls-don-t-crash-ezt-substitution-on-errors-in-we.patch