Skip to content

Commit

Permalink
[fc] Repository: plone.app.versioningbehavior
Browse files Browse the repository at this point in the history 
Branch: refs/heads/master
Date: 2021-11-23T21:59:46-03:00
Author: wesleybl (wesleybl) <wesleybl@gmail.com>
Commit: plone/plone.app.versioningbehavior@bb8eb69

Fix testCloneNamedFileBlobsInUpdatedSchema

Now plone.dexterity uses the repr function to convert _p_mtime from
float to string. The str function in Python 2 rounded off _p_mtime by
generating schema names with an unexpected format. So we need to use
repr here too, so the test doesn't fail in Python 2.

Files changed:
M plone/app/versioningbehavior/tests/test_modifiers.py
Repository: plone.app.versioningbehavior

Branch: refs/heads/master
Date: 2021-11-24T08:35:00+01:00
Author: Alessandro Pisa (ale-rt) <alessandro.pisa@gmail.com>
Commit: plone/plone.app.versioningbehavior@700596c

Merge pull request #60 from plone/fix_testCloneNamedFileBlobsInUpdatedSchema

Fix testCloneNamedFileBlobsInUpdatedSchema

Files changed:
M plone/app/versioningbehavior/tests/test_modifiers.py
  • Loading branch information
@ale-rt
ale-rt committed Nov 24, 2021
1 parent 4d35f0d commit 18d3072
Showing 1 changed file with 17 additions and 30 deletions.
47 changes: 17 additions & 30 deletions last_commit.txt
View file
Original file line number Diff line number Diff line change
@@ -1,50 +1,37 @@
Repository: Products.CMFPlone
Repository: plone.app.versioningbehavior


Branch: refs/heads/master
Date: 2021-11-22T18:34:25-03:00
Date: 2021-11-23T21:59:46-03:00
Author: wesleybl (wesleybl) <wesleybl@gmail.com>
Commit: https://github.com/plone/Products.CMFPlone/commit/189865f049697892ca2f1a69f53267154b60414e
Commit: https://github.com/plone/plone.app.versioningbehavior/commit/bb8eb696ef659c1ae242a80cff915272f84f9ebd

Fix random fails in test_querystring.robot
Fix testCloneNamedFileBlobsInUpdatedSchema

Check if select criteria is visible after clicking in body.
Now plone.dexterity uses the repr function to convert _p_mtime from
float to string. The str function in Python 2 rounded off _p_mtime by
generating schema names with an unexpected format. So we need to use
repr here too, so the test doesn't fail in Python 2.

Files changed:
M Products/CMFPlone/tests/robot/test_querystring.robot
M plone/app/versioningbehavior/tests/test_modifiers.py

b'diff --git a/Products/CMFPlone/tests/robot/test_querystring.robot b/Products/CMFPlone/tests/robot/test_querystring.robot\nindex 0c4a6e49b7..fb98236c81 100644\n--- a/Products/CMFPlone/tests/robot/test_querystring.robot\n+++ b/Products/CMFPlone/tests/robot/test_querystring.robot\n@@ -317,9 +317,9 @@ I expect to be in Simple mode\n Wait Until Element Is Not Visible css=div#select2-drop-mask\n \n open the select box titled ${NAME}\n+ Click Element css=body\n ${select_criteria_selector} Set Variable .querystring-criteria-${NAME} .select2-container a\n Wait Until Element Is Visible css=${select_criteria_selector}\n- Click Element css=body\n Click Element css=${select_criteria_selector}\n \n select index type ${INDEX}\n'
b'diff --git a/plone/app/versioningbehavior/tests/test_modifiers.py b/plone/app/versioningbehavior/tests/test_modifiers.py\nindex 0bf815f..fd78cf1 100644\n--- a/plone/app/versioningbehavior/tests/test_modifiers.py\n+++ b/plone/app/versioningbehavior/tests/test_modifiers.py\n@@ -1,8 +1,6 @@\n # -*- coding: utf-8 -*-\n-from five.intid import site\n from plone.app.testing import setRoles\n from plone.app.testing import TEST_USER_ID\n-from plone.app.testing import TEST_USER_ROLES\n from plone.app.versioningbehavior.modifiers import CloneNamedFileBlobs\n from plone.app.versioningbehavior.modifiers import SkipRelations\n from plone.app.versioningbehavior.testing import PLONE_APP_VERSIONINGBEHAVIOR_FUNCTIONAL_TESTING\n@@ -393,7 +391,7 @@ def testCloneNamedFileBlobsInUpdatedSchema(self):\n attrs_dict = modifier.getReferencedAttributes(file1)\n schema_name = portalTypeToSchemaName(\n \'BlobFile\',\n- suffix=str(self.portal.portal_types.BlobFile._p_mtime)\n+ suffix=repr(self.portal.portal_types.BlobFile._p_mtime)\n )\n attr = "plone.dexterity.schema.generated." + schema_name + ".file"\n self.assertTrue(attr in attrs_dict)\n'

Repository: Products.CMFPlone
Repository: plone.app.versioningbehavior


Branch: refs/heads/master
Date: 2021-11-22T21:12:27-03:00
Author: Wesley Barroso Lopes (wesleybl) <wesleybl@gmail.com>
Commit: https://github.com/plone/Products.CMFPlone/commit/7719b4dd5930a4b74f375eae096ac801d9eeae03

Merge branch 'master' into fix_robot_tests

Files changed:
A news/6002.bugfix
M Products/CMFPlone/profiles/default/metadata.xml

b'diff --git a/Products/CMFPlone/profiles/default/metadata.xml b/Products/CMFPlone/profiles/default/metadata.xml\nindex a1c671787b..a0614cd2e6 100644\n--- a/Products/CMFPlone/profiles/default/metadata.xml\n+++ b/Products/CMFPlone/profiles/default/metadata.xml\n@@ -1,4 +1,4 @@\n <?xml version="1.0"?>\n <metadata>\n- <version>6001</version>\n+ <version>6002</version>\n </metadata>\ndiff --git a/news/6002.bugfix b/news/6002.bugfix\nnew file mode 100644\nindex 0000000000..ff1832f979\n--- /dev/null\n+++ b/news/6002.bugfix\n@@ -0,0 +1 @@\n+Updated metadata version to 6002. [maurits]\n'

Repository: Products.CMFPlone


Branch: refs/heads/master
Date: 2021-11-23T11:07:28+01:00
Date: 2021-11-24T08:35:00+01:00
Author: Alessandro Pisa (ale-rt) <alessandro.pisa@gmail.com>
Commit: https://github.com/plone/Products.CMFPlone/commit/9b13421f57c827f4da4eaf46d3b0a988a4314982
Commit: https://github.com/plone/plone.app.versioningbehavior/commit/700596cc3f3ea0b6373bcb20d6be6ec7d5fe6443

Merge pull request #3364 from plone/fix_robot_tests
Merge pull request #60 from plone/fix_testCloneNamedFileBlobsInUpdatedSchema

Fix random fails in test_querystring.robot
Fix testCloneNamedFileBlobsInUpdatedSchema

Files changed:
M Products/CMFPlone/tests/robot/test_querystring.robot
M plone/app/versioningbehavior/tests/test_modifiers.py

b'diff --git a/Products/CMFPlone/tests/robot/test_querystring.robot b/Products/CMFPlone/tests/robot/test_querystring.robot\nindex 0c4a6e49b7..fb98236c81 100644\n--- a/Products/CMFPlone/tests/robot/test_querystring.robot\n+++ b/Products/CMFPlone/tests/robot/test_querystring.robot\n@@ -317,9 +317,9 @@ I expect to be in Simple mode\n Wait Until Element Is Not Visible css=div#select2-drop-mask\n \n open the select box titled ${NAME}\n+ Click Element css=body\n ${select_criteria_selector} Set Variable .querystring-criteria-${NAME} .select2-container a\n Wait Until Element Is Visible css=${select_criteria_selector}\n- Click Element css=body\n Click Element css=${select_criteria_selector}\n \n select index type ${INDEX}\n'
b'diff --git a/plone/app/versioningbehavior/tests/test_modifiers.py b/plone/app/versioningbehavior/tests/test_modifiers.py\nindex 0bf815f..fd78cf1 100644\n--- a/plone/app/versioningbehavior/tests/test_modifiers.py\n+++ b/plone/app/versioningbehavior/tests/test_modifiers.py\n@@ -1,8 +1,6 @@\n # -*- coding: utf-8 -*-\n-from five.intid import site\n from plone.app.testing import setRoles\n from plone.app.testing import TEST_USER_ID\n-from plone.app.testing import TEST_USER_ROLES\n from plone.app.versioningbehavior.modifiers import CloneNamedFileBlobs\n from plone.app.versioningbehavior.modifiers import SkipRelations\n from plone.app.versioningbehavior.testing import PLONE_APP_VERSIONINGBEHAVIOR_FUNCTIONAL_TESTING\n@@ -393,7 +391,7 @@ def testCloneNamedFileBlobsInUpdatedSchema(self):\n attrs_dict = modifier.getReferencedAttributes(file1)\n schema_name = portalTypeToSchemaName(\n \'BlobFile\',\n- suffix=str(self.portal.portal_types.BlobFile._p_mtime)\n+ suffix=repr(self.portal.portal_types.BlobFile._p_mtime)\n )\n attr = "plone.dexterity.schema.generated." + schema_name + ".file"\n self.assertTrue(attr in attrs_dict)\n'

0 comments on commit 18d3072

Please sign in to comment.