0001-wscall-store-more-informations-after-the-call-9889.patch

Thomas Noël, 06 février 2016 02:49

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

Subject: [PATCH] wscall: store more informations after the call (#9889)

 tests/test_workflows.py | 31 +++++++++++++++++++++++++++++--
 tests/utilities.py      |  1 +
 wcs/wf/wscall.py        | 18 ++++++++++++++++--
 3 files changed, 46 insertions(+), 4 deletions(-)

         item.post = False
         item.varname = 'xxx'
         item.perform(formdata)
         assert formdata.workflow_data.get('xxx_status') == 200
         assert formdata.workflow_data.get('xxx_response') == {'foo': 'bar'}
         assert formdata.workflow_data['xxx_status'] == 200
         assert formdata.workflow_data['xxx_response'] == {'foo': 'bar'}
         assert isinstance(formdata.workflow_data['xxx_time'], time.struct_time)
         formdata.workflow_data = None
         item = WebserviceCallStatusItem()
         item.url = 'http://remote.example.net'
-...
         item = WebserviceCallStatusItem()
         item.url = 'http://remote.example.net/404'
         item.post = False
         item.varname = 'xxx'
         with pytest.raises(AbortActionException):
             item.perform(formdata)
         assert formdata.workflow_data.get('xxx_status') == 404
         assert isinstance(formdata.workflow_data['xxx_time'], time.struct_time)
         assert 'xxx_error_response' not in formdata.workflow_data
         formdata.workflow_data = None
         item = WebserviceCallStatusItem()
         item.url = 'http://remote.example.net/404-json'
         item.post = False
         item.varname = 'xxx'
         with pytest.raises(AbortActionException):
             item.perform(formdata)
         assert formdata.workflow_data.get('xxx_status') == 404
         assert formdata.workflow_data.get('xxx_error_response') == {'err': 1}
         assert isinstance(formdata.workflow_data['xxx_time'], time.struct_time)
         assert 'xxx_response' not in formdata.workflow_data
         formdata.workflow_data = None
         item = WebserviceCallStatusItem()
         item.url = 'http://remote.example.net/404'
-...
         item.action_on_bad_data = ':stop'
         with pytest.raises(AbortActionException):
             item.perform(formdata)
         assert formdata.workflow_data.get('xxx_status') == 200
         assert 'xxx_response' not in formdata.workflow_data
         assert 'xxx_error_response' not in formdata.workflow_data
         formdata.workflow_data = None
         item = WebserviceCallStatusItem()
         item.url = 'http://remote.example.net/404'
-...
         with pytest.raises(AbortActionException):
             item.perform(formdata)
         assert formdata.evolution[-1].parts[-1].summary == 'ValueError: No JSON object could be decoded\n'
         assert formdata.workflow_data.get('xxx_status') == 200
         assert isinstance(formdata.workflow_data['xxx_time'], time.struct_time)
         assert 'xxx_error_response' not in formdata.workflow_data
         formdata.workflow_data = None
     def test_timeout(pub):

tests/utilities.py
217	217
218	218	status, data = {
219	219	'http://remote.example.net/404': (404, 'page not found'),
	220	'http://remote.example.net/404-json': (404, '{"err": 1}'),
220	221	'http://remote.example.net/500': (500, 'internal server error'),
221	222	'http://remote.example.net/json': (200, '{"foo": "bar"}'),
222	223	'http://remote.example.net/xml': (200, '<?xml version="1.0"><foo/>'),

     # You should have received a copy of the GNU General Public License
     # along with this program; if not, see <http://www.gnu.org/licenses/>.
     import time
     import json
     import sys
     import traceback
-...
                         exc_info=sys.exc_info())
             if self.varname:
                 workflow_data = {'%s_status' % self.varname: status}
                 if status == 200:
                 workflow_data = {
                     '%s_status' % self.varname: status,
                     '%s_time' % self.varname: time.localtime()
+                }
                 if (status // 100) == 2:
                     try:
                         d = json_loads(data)
                     except (ValueError, TypeError) as e:
                         formdata.update_workflow_data(workflow_data)
                         formdata.store()
                         self.action_on_error(self.action_on_bad_data, formdata,
                                 response, data=data, exc_info=sys.exc_info())
                     else:
-...
                             formdata.id_display = d.get('data', {}).get('display_id')
                         elif d.get('display_id'):
                             formdata.id_display = d.get('display_id')
                 else: # on error, if data is JSON, record it
                     try:
                         open('/tmp/data','w').write('%s' % data)
                         d = json_loads(data)
                     except (ValueError, TypeError) as e:
                         pass
                     else:
                         workflow_data['%s_error_response' % self.varname] = d
                 formdata.update_workflow_data(workflow_data)
                 formdata.store()
+    -

Projet

Général

Profil

Produits Entr'ouvert » w.c.s.

0001-wscall-store-more-informations-after-the-call-9889.patch