Commit f7705f5a authored by Roque's avatar Roque

Switch back caching policy to must-revalidate (update upgrader constraint)

See merge request !22
parents 6f61db52 d33ccbe4
Pipeline #19577 failed with stage
in 0 seconds
...@@ -136,7 +136,7 @@ class TestOfficeJSScenario(testOfficeJSAppstoreMixin): ...@@ -136,7 +136,7 @@ class TestOfficeJSScenario(testOfficeJSAppstoreMixin):
self.assertEquals(response.status, 200) self.assertEquals(response.status, 200)
self.assertEquals( self.assertEquals(
response.getheader('Cache-Control'), response.getheader('Cache-Control'),
'max-age=600, stale-while-revalidate=360000, stale-if-error=31536000, public' 'max-age=0, public, must-revalidate'
) )
self.assertTrue( self.assertTrue(
'text/html;' in response.getheader('Content-Type'), 'text/html;' in response.getheader('Content-Type'),
...@@ -152,12 +152,11 @@ class TestOfficeJSScenario(testOfficeJSAppstoreMixin): ...@@ -152,12 +152,11 @@ class TestOfficeJSScenario(testOfficeJSAppstoreMixin):
) )
self.assertEquals( self.assertEquals(
response.getheader('Vary').replace(' ', ''), response.getheader('Vary').replace(' ', ''),
'Cookie,Authorization,Accept-Encoding' 'Accept-Language,Cookie,Authorization,Accept-Encoding'
) )
# First access to Base_getWebDocumentDrivenModificationDate writes in ZODB # First access to Base_getWebDocumentDrivenModificationDate writes in ZODB
self.tic() self.tic()
################################### ###################################
### Anonymous: access the redirect application appcache ### Anonymous: access the redirect application appcache
connection.request( connection.request(
...@@ -168,7 +167,8 @@ class TestOfficeJSScenario(testOfficeJSAppstoreMixin): ...@@ -168,7 +167,8 @@ class TestOfficeJSScenario(testOfficeJSAppstoreMixin):
page_content = response.read() page_content = response.read()
self.assertEquals("""CACHE MANIFEST self.assertEquals("""CACHE MANIFEST
# development / %s""" % web_section.Base_getWebDocumentDrivenModificationDate().rfc822(), CACHE:
NETWORK:""",
page_content page_content
) )
self.assertEquals(response.status, 200) self.assertEquals(response.status, 200)
...@@ -258,7 +258,7 @@ class TestOfficeJSScenario(testOfficeJSAppstoreMixin): ...@@ -258,7 +258,7 @@ class TestOfficeJSScenario(testOfficeJSAppstoreMixin):
self.assertEquals(response.status, 200) self.assertEquals(response.status, 200)
self.assertEquals( self.assertEquals(
response.getheader('Cache-Control'), response.getheader('Cache-Control'),
'max-age=600, stale-while-revalidate=360000, stale-if-error=31536000, public' 'max-age=0, public, must-revalidate'
) )
self.assertTrue( self.assertTrue(
'text/html;' in response.getheader('Content-Type'), 'text/html;' in response.getheader('Content-Type'),
...@@ -274,7 +274,7 @@ class TestOfficeJSScenario(testOfficeJSAppstoreMixin): ...@@ -274,7 +274,7 @@ class TestOfficeJSScenario(testOfficeJSAppstoreMixin):
) )
self.assertEquals( self.assertEquals(
response.getheader('Vary').replace(' ', ''), response.getheader('Vary').replace(' ', ''),
'Cookie,Authorization,Accept-Encoding' 'Accept-Language,Cookie,Authorization,Accept-Encoding'
) )
################################### ###################################
...@@ -306,7 +306,7 @@ class TestOfficeJSScenario(testOfficeJSAppstoreMixin): ...@@ -306,7 +306,7 @@ class TestOfficeJSScenario(testOfficeJSAppstoreMixin):
self.assertEquals(response.status, 200) self.assertEquals(response.status, 200)
self.assertEquals( self.assertEquals(
response.getheader('Cache-Control'), response.getheader('Cache-Control'),
'max-age=600, stale-while-revalidate=360000, stale-if-error=31536000, public' 'max-age=0, public, must-revalidate'
) )
self.assertTrue( self.assertTrue(
'text/html;' in response.getheader('Content-Type'), 'text/html;' in response.getheader('Content-Type'),
...@@ -322,7 +322,7 @@ class TestOfficeJSScenario(testOfficeJSAppstoreMixin): ...@@ -322,7 +322,7 @@ class TestOfficeJSScenario(testOfficeJSAppstoreMixin):
) )
self.assertEquals( self.assertEquals(
response.getheader('Vary').replace(' ', ''), response.getheader('Vary').replace(' ', ''),
'Cookie,Authorization,Accept-Encoding' 'Accept-Language,Cookie,Authorization,Accept-Encoding'
) )
################################### ###################################
...@@ -335,7 +335,8 @@ class TestOfficeJSScenario(testOfficeJSAppstoreMixin): ...@@ -335,7 +335,8 @@ class TestOfficeJSScenario(testOfficeJSAppstoreMixin):
page_content = response.read() page_content = response.read()
self.assertEquals("""CACHE MANIFEST self.assertEquals("""CACHE MANIFEST
# %s / %s""" % (web_section.getId(), web_section.Base_getWebDocumentDrivenModificationDate().rfc822()), CACHE:
NETWORK:""",
page_content page_content
) )
self.assertEquals(response.status, 200) self.assertEquals(response.status, 200)
......
...@@ -45,7 +45,11 @@ ...@@ -45,7 +45,11 @@
<item> <item>
<key> <string>text_content_warning_message</string> </key> <key> <string>text_content_warning_message</string> </key>
<value> <value>
<tuple/> <tuple>
<string>W:113, 28: Unused variable \'api_path\' (unused-variable)</string>
<string>W:113, 38: Unused variable \'api_query\' (unused-variable)</string>
<string>W:114, 6: Unused variable \'api_fragment\' (unused-variable)</string>
</tuple>
</value> </value>
</item> </item>
<item> <item>
...@@ -100,11 +104,13 @@ ...@@ -100,11 +104,13 @@
</record> </record>
<record id="4" aka="AAAAAAAAAAQ="> <record id="4" aka="AAAAAAAAAAQ=">
<pickle> <pickle>
<global name="WorkflowHistoryList" module="Products.ERP5Type.patches.WorkflowTool"/> <global name="WorkflowHistoryList" module="Products.ERP5Type.Workflow"/>
</pickle> </pickle>
<pickle> <pickle>
<tuple> <dictionary>
<none/> <item>
<key> <string>_log</string> </key>
<value>
<list> <list>
<dictionary> <dictionary>
<item> <item>
...@@ -117,7 +123,9 @@ ...@@ -117,7 +123,9 @@
</item> </item>
</dictionary> </dictionary>
</list> </list>
</tuple> </value>
</item>
</dictionary>
</pickle> </pickle>
</record> </record>
</ZopeData> </ZopeData>
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<global name="Test Component" module="erp5.portal_type"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>_recorded_property_dict</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</value>
</item>
<item>
<key> <string>default_reference</string> </key>
<value> <string>testOfficeJSScenarioRjsUI</string> </value>
</item>
<item>
<key> <string>description</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>test.erp5.testOfficeJSScenarioRjsUI</string> </value>
</item>
<item>
<key> <string>portal_type</string> </key>
<value> <string>Test Component</string> </value>
</item>
<item>
<key> <string>sid</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>text_content_error_message</string> </key>
<value>
<tuple/>
</value>
</item>
<item>
<key> <string>text_content_warning_message</string> </key>
<value>
<tuple/>
</value>
</item>
<item>
<key> <string>version</string> </key>
<value> <string>erp5</string> </value>
</item>
<item>
<key> <string>workflow_history</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
</value>
</item>
</dictionary>
</pickle>
</record>
<record id="2" aka="AAAAAAAAAAI=">
<pickle>
<global name="PersistentMapping" module="Persistence.mapping"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>data</string> </key>
<value>
<dictionary/>
</value>
</item>
</dictionary>
</pickle>
</record>
<record id="3" aka="AAAAAAAAAAM=">
<pickle>
<global name="PersistentMapping" module="Persistence.mapping"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>data</string> </key>
<value>
<dictionary>
<item>
<key> <string>component_validation_workflow</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent>
</value>
</item>
</dictionary>
</value>
</item>
</dictionary>
</pickle>
</record>
<record id="4" aka="AAAAAAAAAAQ=">
<pickle>
<global name="WorkflowHistoryList" module="Products.ERP5Type.patches.WorkflowTool"/>
</pickle>
<pickle>
<tuple>
<none/>
<list>
<dictionary>
<item>
<key> <string>action</string> </key>
<value> <string>validate</string> </value>
</item>
<item>
<key> <string>validation_state</string> </key>
<value> <string>validated</string> </value>
</item>
</dictionary>
</list>
</tuple>
</pickle>
</record>
</ZopeData>
test.erp5.testOfficeJSSecurity test.erp5.testOfficeJSSecurity
test.erp5.testOfficeJSScenario test.erp5.testOfficeJSScenario
test.erp5.testOfficeJSScenarioRjsUI
test.erp5.testFunctionalOfficeJSAppstorePublisherUI test.erp5.testFunctionalOfficeJSAppstorePublisherUI
test.erp5.testFunctionalOfficeJSAppstoreSiteUI test.erp5.testFunctionalOfficeJSAppstoreSiteUI
test.erp5.testOfficeJSScenarioAppstore test.erp5.testOfficeJSScenarioAppstore
......
...@@ -4,10 +4,10 @@ error_list = [] ...@@ -4,10 +4,10 @@ error_list = []
person = web_section.getSourceValue(portal_type='Person') person = web_section.getSourceValue(portal_type='Person')
if (web_section.getParentId() == 'application-list') \ if (web_section.getParentId() == 'application-list') \
and (web_section.getAggregate() == 'web_page_module/gadget_ojs_appstore_redirect_page_html') \ and (web_section.getAggregate() == 'web_page_module/gadget_ojs_appstore_redirect_page_html') \
and (web_section.getCachingPolicy() == 'must-revalidate'): and (web_section.getCachingPolicy() == 'one-hour-max-modification-date'):
error_list.append('"Must-revalidate" caching policy is deprecated') error_list.append('"One-hour-max-modification-date" caching policy is deprecated')
if fixit: if fixit:
web_section.edit(caching_policy='one-hour-max-modification-date') web_section.edit(caching_policy='must-revalidate')
return error_list return error_list
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment