- 03 Mar, 2023 40 commits
-
-
Jérome Perrin authored
On Zope2, there was support for starting a ZServer (in Testing.ZopeTestCase.utils.startZServer) and there was another makerequest (in Testing.ZopeTestCase.utils.makerequest) which had knowledge of this ZServer address. We are using our own implementation of startZServer, which also knows how to start a WSGI server, but we we were interacting with Testing.ZopeTestCase.utils so that its makerequest knows about our web server. On Zope4 there is no utility to start an http server from the tests and the makerequest is also gone. This revisits the web server from test interaction with makerequest: - no longer use PortalTestCase._app which creates an app with a request to http://nohost, but implement our own _app which creates a request to our web server - store our server address as class attributes on ProcessingNodeTestCase instead of patching pseudo constants in utils (these pseudo constants no longer exist) - in the case of ERP5TypeLiveTestCase, also rewrap the site to use a request to our web server (which was done on Zope2 by using Testing.ZopeTestCase.utils.makerequest and not Testing.makerequest.makerequest directly)
-
Jérome Perrin authored
Update to https://github.com/plone/Products.PortalTransforms/blob/3.2.0/Products/PortalTransforms/transforms/rest.py because Zope4 no longer ship with a reStructuredText module and recommend using docutils directly instead, which is what upstream did. ( in zope4py2 branch this was working because slapos patch component/egg-patch/Zope/0001-OFS-XMLExportImport.patch used to bring back reStructuredText but we don't seem to need it )
-
Jérome Perrin authored
-
Jérome Perrin authored
Zope2 did not have WSGIPublisher, this patch was a backport of the module from Zope 4. Now that we use Zope 4, we no longer need to copy the module code, but we still need a patch to apply the deadline patch.
-
Aurel authored
There are some few differences: In Zope4 exceptions are callable, but we don't want to call them here, so we use a python: expression instead of the path expression which tries to call error_value. error_message is sometimes not passed. The context is different: Since Zope 4, the `standard_error_message` is rendered in the context of REQUEST['PUBLISHED'], which in case of publishing a skin (page template or script) in the context of a document is is the skin itself, but for error rendering in case of erp5_web Web Site or Web Section, we expect standard_error_message_template to always be rendered in the context of the document, that's why we use REQUEST.PARENTS[0] as context. REQUEST.PUBLISHED = <PythonScript at /erp5/script used for /erp5/module/document> REQUEST.PARENTS [<Document>, <Module>, <ERP5Site>, ...] In case of redirect, the body is no longer empty, but we explicitly return an empty body to keep the same behavior as zope2
-
Jérome Perrin authored
This reverts commit eaae74a0. On Zope4 branch we are ready to use __code__
-
Aurel authored
-
Arnaud Fontaine authored
-
Arnaud Fontaine authored
-
Arnaud Fontaine authored
-
Arnaud Fontaine authored
This supports both python2 and python3. For python3, this decode() properly arguments returned by string_literal() to have str(), otherwise the query string is an str() (DocumentTemplate) and the arguments are bytes(). In other places, bytes() is used directly but in this case this is not needed and would require monkey patching (at least) DocumentTemplate.
-
Jérome Perrin authored
This changes slightly getOutput, `Status` is not printed as an header (Status: 200 OK) but only in the status line (HTTP/1.1 200 OK)
-
Jérome Perrin authored
In case of ConflictError, request will be retied for HTTPRequest.retry_max_count times. For Zope 2, the default value of the class attribute was 3, but on Zope 4, default value is 0 and this is set to 3 on startup (by Zope2.Startup.handlers.root_wsgi_handler). This startup code is not executed by runUnitTest, we need to set HTTPRequest.retry_max_count somewhere, otherwise ConflictError are not retried during tests.
-
Jérome Perrin authored
The status message no longer use system-msg class, use simpler "assertTextPresent" that should be enough. Simplify the waiting for static pages, clickAndWait is enough.
-
Jérome Perrin authored
With zope.tal 3.6.0 - commit 26fadc4 (Increase the default value of the `wrap` argument from 60 to 1023 characters, to avoid extra whitespace and line breaks., 2011-08-20) from zopefoundation/zope.tal - page templates keep the attributes on the same line and produce slightly different output, although equivalent. This commit updates the places where we do snapshot testing to the new output. We discussed using lxml features to compare html and xml from https://lxml.de/lxmlhtml.html#running-html-doctests but because the corporate identity web pages are invalid html, it seems unsafe to rely on lxml at this point. Once corporate identity web pages are fixed this would probably be a good thing to do.
-
Arnaud Fontaine authored
zope.conf of Zope2 (zopeschema.xml) used to define event/Z2 log files and properly configure logging but this is not the case anymore with Zope4 (wsgischema.xml). This adds path to event/Z2 log files as command line parameter as we probably don't need further configuration such as message format (SlapOS recipe has never handled it anyway).
-
Arnaud Fontaine authored
-
Arnaud Fontaine authored
Also, `__code__` has been introduced in Python 2.6 (for forwards compatibility with Python 3) as an alias to func_code which has been completely removed in Python 3. This fixes testFunctionalCore failures: [...] Module ZPublisher.mapply, line 53, in mapply code = f.__code__ AttributeError: 'DefaultGetter' object has no attribute '__code__'
-
Arnaud Fontaine authored
-
Arnaud Fontaine authored
See Revert "zope patches: display OFSFile content using full available height in zmi". This fixes testBigFile failures because of `size` not being set to 0 when `data` is set to None.
-
Arnaud Fontaine authored
-
Arnaud Fontaine authored
Modify DTML templates likewise Zope4 removal commit: commit 1df76c1ea8911d7d9249eb6beab1fafd4ed5803c Author: Hanno Schlichting <hanno@hannosch.eu> Date: Sun Jul 3 14:19:26 2011 +0000 Removed `bobobase_modification_time` from `Persistence.Persistent`, you can use `DateTime(object._p_mtime)` instead. This fixes failure on test_PROPFIND_on_document (testWebDavSupport).
-
Jérome Perrin authored
This reverts commit 8f5497d4. This is not longer needed - with Zope 4 the ZMI is better and we now have possibility to edit most of these through ERP5 user interface. The main motivation is that these kind of patches are really hard to keep up to date.
-
Jérome Perrin authored
This reverts commit 88786a70. This is not longer needed - with Zope 4 the ZMI is better and we now have possibility to edit most of these through ERP5 user interface. The main motivation is that these kind of patches are really hard to keep up to date.
-
Jérome Perrin authored
This reverts commit c89e308f. This is not longer needed - with Zope 4 the ZMI is better and we now have possibility to edit most of these through ERP5 user interface. The main motivation is that these kind of patches are really hard to keep up to date.
-
Jérome Perrin authored
In the changes from ExternalMethod 2.13.1 -> 4.5, now ExternalMethod define __code__ (and __defaults__) to a computed attribute calling getFunction, but getFunction is different in our patched class, so when unwrapMethod tries to get __code__, it will raise and mapply will not consider the external method as being callable, so a simple __repr__ of the ExternalMethod will be used as response body when published. By defining __code__ to something using our patched logic, this problem does not happen.
-
Arnaud Fontaine authored
Utility function taking care of the internal changes between RestrictedPython v3 and v5, keeping support for both (instead of having multiple if statements).
-
Tatuya Kamada authored
-
Aurel authored
-
Aurel authored
-
Aurel authored
-
Aurel authored
-
Aurel authored
-
Aurel authored
-
Aurel authored
-
Aurel authored
-
Aurel authored
* Emtpy parameter. * No argument.
-
Aurel authored
-
Aurel authored
* "OFS.CopySupport exceptions have been removed: you should use strings instead." * "WSGI is used in place of ZServer." * "StringType must be imported from types" * "'script' is forbidden as python script name"
-
Levin Zimmermann authored
With nexedi/erp5@a254bf50 we migrated most of np related security code from Wendelin to ERP5, we only missed few lines. This patch moves the remaining lines to ERP5 so that all numpy related restricted python code is at one place and no longer scattered at two different repos/files. tested at: https://erp5js.nexedi.net/#/test_result_module/20230302-F5352509
-