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 committed Nov 24, 2021
1 parent 6917533 commit 3824865
Showing 1 changed file with 19 additions and 16 deletions.
35 changes: 19 additions & 16 deletions last_commit.txt
Original file line number Diff line number Diff line change
@@ -1,34 +1,37 @@
Repository: plone.app.blob
Repository: plone.app.versioningbehavior


Branch: refs/heads/master
Date: 2021-11-19T10:16:06+01:00
Author: Kim Paulissen (spereverde) <spereverde@gmail.com>
Commit: https://github.com/plone/plone.app.blob/commit/749f4da34414e69755a2e65684e54fe2129d618c
Date: 2021-11-23T21:59:46-03:00
Author: wesleybl (wesleybl) <wesleybl@gmail.com>
Commit: https://github.com/plone/plone.app.versioningbehavior/commit/bb8eb696ef659c1ae242a80cff915272f84f9ebd

adjust url for package
Fix testCloneNamedFileBlobsInUpdatedSchema

plone.org/products no longer exists
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 setup.py
M plone/app/versioningbehavior/tests/test_modifiers.py

b"diff --git a/setup.py b/setup.py\nindex fafd7fe..c041992 100644\n--- a/setup.py\n+++ b/setup.py\n@@ -34,7 +34,7 @@ def read(*rnames):\n keywords='zodb blob support plone integration',\n author='Plone Foundation',\n author_email='plone-developers@lists.sourceforge.net',\n- url='http://plone.org/products/plone.app.blob',\n+ url='https://github.com/plone/plone.app.blob',\n download_url='https://pypi.org/project/plone.app.blob/',\n license='GPL version 2',\n packages=find_packages('src'),\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: plone.app.blob
Repository: plone.app.versioningbehavior


Branch: refs/heads/master
Date: 2021-11-20T08:16:08+01:00
Author: Jens W. Klein (jensens) <jk@kleinundpartner.at>
Commit: https://github.com/plone/plone.app.blob/commit/61ad5379ca820a489c698b5f8a7a477af510e39e
Date: 2021-11-24T08:35:00+01:00
Author: Alessandro Pisa (ale-rt) <alessandro.pisa@gmail.com>
Commit: https://github.com/plone/plone.app.versioningbehavior/commit/700596cc3f3ea0b6373bcb20d6be6ec7d5fe6443

Merge pull request #56 from plone/spereverde-patch-1
Merge pull request #60 from plone/fix_testCloneNamedFileBlobsInUpdatedSchema

adjust url for package
Fix testCloneNamedFileBlobsInUpdatedSchema

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

b"diff --git a/setup.py b/setup.py\nindex fafd7fe..c041992 100644\n--- a/setup.py\n+++ b/setup.py\n@@ -34,7 +34,7 @@ def read(*rnames):\n keywords='zodb blob support plone integration',\n author='Plone Foundation',\n author_email='plone-developers@lists.sourceforge.net',\n- url='http://plone.org/products/plone.app.blob',\n+ url='https://github.com/plone/plone.app.blob',\n download_url='https://pypi.org/project/plone.app.blob/',\n license='GPL version 2',\n packages=find_packages('src'),\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 3824865

Please sign in to comment.