0001-test-make-a-fixture-of-HttpRequestMocking-16509.patch

Benjamin Dauvergne, 25 mai 2017 15:02

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

Subject: [PATCH 1/2] test: make a fixture of HttpRequestMocking (#16509)

 tests/conftest.py              |  9 ++++++++-
 tests/test_admin_pages.py      |  2 +-
 tests/test_backoffice_pages.py |  2 +-
 tests/test_workflows.py        | 11 ++++++-----
 tests/test_wscall.py           | 11 +++++++----
 tests/utilities.py             | 19 +++++++++++++++++--
 6 files changed, 40 insertions(+), 14 deletions(-)

     import pytest
     from utilities import EmailsMocking, SMSMocking
     from utilities import EmailsMocking, SMSMocking, HttpRequestsMocking
     def pytest_addoption(parser):
         parser.addoption('--without-postgresql-tests', action='store_true',
-...
         with EmailsMocking() as mock:
             yield mock
     @pytest.fixture
     def sms_mocking():
         with SMSMocking() as sms:
             yield sms
     @pytest.fixture
     def http_requests():
         with HttpRequestsMocking() as http_requests:
             yield http_requests

         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):
     def test_form_comment_with_error_in_wscall(http_requests, pub):
         create_superuser(pub)
         NamedWsCall.wipe()

         assert (' with the number %s.' % number31.get_display_id()) in resp.body
         assert not 'Error during webservice call' in resp.body
     def test_backoffice_wscall_attachment(pub):
     def test_backoffice_wscall_attachment(http_requests, pub):
         create_user(pub)
         create_environment(pub)
         formdef = FormDef.get_by_urlname('form-title')

     from wcs.wf.redirect_to_url import RedirectToUrlWorkflowStatusItem
     from utilities import (create_temporary_pub, MockSubstitutionVariables,
             http_requests, clean_temporary_pub)
             clean_temporary_pub)
     def setup_module(module):
         cleanup()
-...
         assert emails.count() == 1
         assert emails.get('foobar').get('from') == 'foobar@localhost'
     def test_webservice_call(pub):
     def test_webservice_call(http_requests, pub):
         pub.substitutions.feed(MockSubstitutionVariables())
         FormDef.wipe()
-...
         item.action_on_network_errors = ':stop'
         assert item.waitpoint
     def test_webservice_call_error_handling(pub):
     def test_webservice_call_error_handling(http_requests, pub):
         pub.substitutions.feed(MockSubstitutionVariables())
         FormDef.wipe()
-...
         item.perform(formdata)
         assert pub.user_class.get(user.id).form_data == {'3': 'Plop'}
     def test_set_backoffice_field(two_pubs):
     def test_set_backoffice_field(http_requests, two_pubs):
         Workflow.wipe()
         FormDef.wipe()
         wf = Workflow(name='xxx')
-...
         formdata = formdef.data_class().get(formdata.id)
         assert formdata.data['bo1'] == 'HELLO'
     def test_set_backoffice_field_file(two_pubs):
     def test_set_backoffice_field_file(http_requests, two_pubs):
         Workflow.wipe()
         FormDef.wipe()
         wf = Workflow(name='xxx')

     from wcs.qommon.http_request import HTTPRequest
     from wcs.wscalls import NamedWsCall
     from utilities import create_temporary_pub, clean_temporary_pub, http_requests
     from utilities import create_temporary_pub, clean_temporary_pub
     @pytest.fixture
-...
         assert 'bye' in NamedWsCall.keys()
         assert not 'hello_1' in NamedWsCall.keys()
     def test_webservice_substitution_variable(pub):
     def test_webservice_substitution_variable(http_requests, pub):
         NamedWsCall.wipe()
         wscall = NamedWsCall()
-...
         variables = pub.substitutions.get_context_variables()
         assert variables['webservice'].hello_world == {'foo': 'bar'}
     def test_webservice_auto_sign(pub):
     def test_webservice_auto_sign(http_requests, pub):
         NamedWsCall.wipe()
         wscall = NamedWsCall()
-...
         assert not 'orig=example.net' in http_requests.get_last('url')
         assert 'signature=' in http_requests.get_last('url')
     def test_webservice_post_with_no_payload(pub):
     def test_webservice_post_with_no_payload(http_requests, pub):
         NamedWsCall.wipe()
         wscall = NamedWsCall()

     class HttpRequestsMocking(object):
         def __init__(self):
             self.requests = []
         def __enter__(self):
             import wcs.qommon.misc
             import qommon.misc
             self.wcs_qommon_misc_http_request = wcs.qommon.misc._http_request
             self.qommon_misc_http_request = qommon.misc._http_request
             wcs.qommon.misc._http_request = self.http_request
             qommon.misc._http_request = self.http_request
             return self
         def __exit__(self, exc_type, exc_value, tb):
             import wcs.qommon.misc
             import qommon.misc
             wcs.qommon.misc._http_request = self.wcs_qommon_misc_http_request
             qommon.misc._http_request = self.qommon_misc_http_request
             del self.wcs_qommon_misc_http_request
             del self.qommon_misc_http_request
         def http_request(self, url, method='GET', body=None, headers={}, timeout=None):
             self.requests.append(
-...
         def empty(self):
             self.requests = []
     http_requests = HttpRequestsMocking()
     class SMSMocking(wcs.qommon.sms.MobytSMS):
         def get_sms_class(self, mode):
+    -

Projet

Général

Profil

Produits Entr'ouvert » w.c.s.

0001-test-make-a-fixture-of-HttpRequestMocking-16509.patch