From b80da88f65db4c74838877cbe3199b739d76210d Mon Sep 17 00:00:00 2001 From: mauritsvanrees Date: Wed, 20 Sep 2023 22:17:18 +0200 Subject: [PATCH] [fc] Repository: plone.testing Branch: refs/heads/master Date: 2023-09-20T21:24:17+02:00 Author: Maurits van Rees (mauritsvanrees) Commit: https://github.com/plone/plone.testing/commit/786074e81efb0c2c2f9f489191f6de1629ff4fd4 Fix tests when run with ZODB 5.8.1+. Test failures: ``` Failure in test /Users/maurits/community/plone-coredev/6.0/src/plone.testing/src/plone/testing/zodb.rst Failed doctest test for zodb.rst File "/Users/maurits/community/plone-coredev/6.0/src/plone.testing/src/plone/testing/zodb.rst", line 0 ---------------------------------------------------------------------- File "/Users/maurits/community/plone-coredev/6.0/src/plone.testing/src/plone/testing/zodb.rst", line 55, in zodb.rst Failed example: zodb.EMPTY_ZODB['zodbConnection'] Expected: <Connection at ...> Got: <ZODB.Connection.Connection object at 0x1071e7f10> ---------------------------------------------------------------------- File "/Users/maurits/community/plone-coredev/6.0/src/plone.testing/src/plone/testing/zodb.rst", line 138, in zodb.rst Failed example: POPULATED_ZODB['zodbConnection'] Expected: <Connection at ...> Got: <ZODB.Connection.Connection object at 0x107256a10> ---------------------------------------------------------------------- File "/Users/maurits/community/plone-coredev/6.0/src/plone.testing/src/plone/testing/zodb.rst", line 233, in zodb.rst Failed example: EXPANDED_ZODB['zodbConnection'] Expected: <Connection at ...> Got: <ZODB.Connection.Connection object at 0x107268550> ``` Files changed: A news/581.bugfix M pyproject.toml M src/plone/testing/zodb.rst Repository: plone.testing Branch: refs/heads/master Date: 2023-09-20T22:17:18+02:00 Author: Maurits van Rees (mauritsvanrees) Commit: https://github.com/plone/plone.testing/commit/5cbdff3fa9d1a7b1102d6807db73a059203af475 Merge pull request #84 from plone/maurits-fix-zodb-581-tests Fix tests when run with ZODB 5.8.1+. Files changed: A news/581.bugfix M pyproject.toml M src/plone/testing/zodb.rst --- last_commit.txt | 68 ++++++++++++++++++++++++++++++++++++------------- 1 file changed, 51 insertions(+), 17 deletions(-) diff --git a/last_commit.txt b/last_commit.txt index 83ef8bedf9..511f545196 100644 --- a/last_commit.txt +++ b/last_commit.txt @@ -1,34 +1,68 @@ -Repository: Products.CMFPlone +Repository: plone.testing -Branch: refs/heads/6.0.x -Date: 2023-09-19T16:06:43+02:00 +Branch: refs/heads/master +Date: 2023-09-20T21:24:17+02:00 Author: Maurits van Rees (mauritsvanrees) -Commit: https://github.com/plone/Products.CMFPlone/commit/8855e8e7ad99ab10eccb89189f044a0d03044255 +Commit: https://github.com/plone/plone.testing/commit/786074e81efb0c2c2f9f489191f6de1629ff4fd4 -Register site syndication settings from plone.base instead of CMFPlone. +Fix tests when run with ZODB 5.8.1+. + +Test failures: +``` +Failure in test /Users/maurits/community/plone-coredev/6.0/src/plone.testing/src/plone/testing/zodb.rst +Failed doctest test for zodb.rst + File "/Users/maurits/community/plone-coredev/6.0/src/plone.testing/src/plone/testing/zodb.rst", line 0 + +---------------------------------------------------------------------- +File "/Users/maurits/community/plone-coredev/6.0/src/plone.testing/src/plone/testing/zodb.rst", line 55, in zodb.rst +Failed example: + zodb.EMPTY_ZODB['zodbConnection'] +Expected: + <Connection at ...> +Got: + <ZODB.Connection.Connection object at 0x1071e7f10> +---------------------------------------------------------------------- +File "/Users/maurits/community/plone-coredev/6.0/src/plone.testing/src/plone/testing/zodb.rst", line 138, in zodb.rst +Failed example: + POPULATED_ZODB['zodbConnection'] +Expected: + <Connection at ...> +Got: + <ZODB.Connection.Connection object at 0x107256a10> +---------------------------------------------------------------------- +File "/Users/maurits/community/plone-coredev/6.0/src/plone.testing/src/plone/testing/zodb.rst", line 233, in zodb.rst +Failed example: + EXPANDED_ZODB['zodbConnection'] +Expected: + <Connection at ...> +Got: + <ZODB.Connection.Connection object at 0x107268550> +``` Files changed: -A news/315.bugfix -M Products/CMFPlone/profiles/dependencies/registry.xml +A news/581.bugfix +M pyproject.toml +M src/plone/testing/zodb.rst -b'diff --git a/Products/CMFPlone/profiles/dependencies/registry.xml b/Products/CMFPlone/profiles/dependencies/registry.xml\nindex 865653a149..0a65468523 100644\n--- a/Products/CMFPlone/profiles/dependencies/registry.xml\n+++ b/Products/CMFPlone/profiles/dependencies/registry.xml\n@@ -103,7 +103,7 @@\n plone.dashboard4\n \n \n- \n+ \n \n \n \ndiff --git a/news/315.bugfix b/news/315.bugfix\nnew file mode 100644\nindex 0000000000..90c7dd6efe\n--- /dev/null\n+++ b/news/315.bugfix\n@@ -0,0 +1,2 @@\n+Register site syndication settings from plone.base instead of CMFPlone.\n+[maurits]\n' +b'diff --git a/news/581.bugfix b/news/581.bugfix\nnew file mode 100644\nindex 0000000..69f5d06\n--- /dev/null\n+++ b/news/581.bugfix\n@@ -0,0 +1,2 @@\n+Fix tests when run with ZODB 5.8.1+.\n+[maurits]\ndiff --git a/pyproject.toml b/pyproject.toml\nindex 05b615d..12c6bc8 100644\n--- a/pyproject.toml\n+++ b/pyproject.toml\n@@ -1,6 +1,6 @@\n [tool.towncrier]\n-filename = "CHANGES.rst"\n directory = "news/"\n+filename = "CHANGES.rst"\n title_format = "{version} ({project_date})"\n underlines = ["-", ""]\n \n@@ -18,3 +18,21 @@ showcontent = true\n directory = "bugfix"\n name = "Bug fixes:"\n showcontent = true\n+\n+[[tool.towncrier.type]]\n+directory = "internal"\n+name = "Internal:"\n+showcontent = true\n+\n+[[tool.towncrier.type]]\n+directory = "documentation"\n+name = "Documentation:"\n+showcontent = true\n+\n+[[tool.towncrier.type]]\n+directory = "tests"\n+name = "Tests"\n+showcontent = true\n+\n+[tool.isort]\n+profile = "plone"\ndiff --git a/src/plone/testing/zodb.rst b/src/plone/testing/zodb.rst\nindex 6a9cf73..a18c473 100644\n--- a/src/plone/testing/zodb.rst\n+++ b/src/plone/testing/zodb.rst\n@@ -53,7 +53,7 @@ Let\'s now simulate a test.::\n The test would then execute. It may use the ZODB root.::\n \n >>> zodb.EMPTY_ZODB[\'zodbConnection\']\n- \n+ <...Connection...at ...>\n \n >>> zodb.EMPTY_ZODB[\'zodbRoot\']\n {}\n@@ -136,7 +136,7 @@ Let\'s now simulate a test.::\n The test would then execute. It may use the ZODB root.::\n \n >>> POPULATED_ZODB[\'zodbConnection\']\n- \n+ <...Connection...at ...>\n \n >>> POPULATED_ZODB[\'zodbRoot\']\n {\'someData\': \'a string\'}\n@@ -231,7 +231,7 @@ Let\'s now simulate a test.::\n The test would then execute. It may use the ZODB root.::\n \n >>> EXPANDED_ZODB[\'zodbConnection\']\n- \n+ <...Connection...at ...>\n \n >>> EXPANDED_ZODB[\'zodbRoot\'] == dict(someData=\'a string\', additionalData=\'Some new data\')\n True\n' -Repository: Products.CMFPlone +Repository: plone.testing -Branch: refs/heads/6.0.x -Date: 2023-09-19T17:28:37+02:00 +Branch: refs/heads/master +Date: 2023-09-20T22:17:18+02:00 Author: Maurits van Rees (mauritsvanrees) -Commit: https://github.com/plone/Products.CMFPlone/commit/1e922492e8f73c4f54365f71456f64cab693c621 +Commit: https://github.com/plone/plone.testing/commit/5cbdff3fa9d1a7b1102d6807db73a059203af475 -Merge pull request #3842 from plone/maurits-site-syndication-settings +Merge pull request #84 from plone/maurits-fix-zodb-581-tests -Register site syndication settings from plone.base instead of CMFPlone. +Fix tests when run with ZODB 5.8.1+. Files changed: -A news/315.bugfix -M Products/CMFPlone/profiles/dependencies/registry.xml +A news/581.bugfix +M pyproject.toml +M src/plone/testing/zodb.rst -b'diff --git a/Products/CMFPlone/profiles/dependencies/registry.xml b/Products/CMFPlone/profiles/dependencies/registry.xml\nindex 865653a149..0a65468523 100644\n--- a/Products/CMFPlone/profiles/dependencies/registry.xml\n+++ b/Products/CMFPlone/profiles/dependencies/registry.xml\n@@ -103,7 +103,7 @@\n plone.dashboard4\n \n \n- \n+ \n \n \n \ndiff --git a/news/315.bugfix b/news/315.bugfix\nnew file mode 100644\nindex 0000000000..90c7dd6efe\n--- /dev/null\n+++ b/news/315.bugfix\n@@ -0,0 +1,2 @@\n+Register site syndication settings from plone.base instead of CMFPlone.\n+[maurits]\n' +b'diff --git a/news/581.bugfix b/news/581.bugfix\nnew file mode 100644\nindex 0000000..69f5d06\n--- /dev/null\n+++ b/news/581.bugfix\n@@ -0,0 +1,2 @@\n+Fix tests when run with ZODB 5.8.1+.\n+[maurits]\ndiff --git a/pyproject.toml b/pyproject.toml\nindex 05b615d..12c6bc8 100644\n--- a/pyproject.toml\n+++ b/pyproject.toml\n@@ -1,6 +1,6 @@\n [tool.towncrier]\n-filename = "CHANGES.rst"\n directory = "news/"\n+filename = "CHANGES.rst"\n title_format = "{version} ({project_date})"\n underlines = ["-", ""]\n \n@@ -18,3 +18,21 @@ showcontent = true\n directory = "bugfix"\n name = "Bug fixes:"\n showcontent = true\n+\n+[[tool.towncrier.type]]\n+directory = "internal"\n+name = "Internal:"\n+showcontent = true\n+\n+[[tool.towncrier.type]]\n+directory = "documentation"\n+name = "Documentation:"\n+showcontent = true\n+\n+[[tool.towncrier.type]]\n+directory = "tests"\n+name = "Tests"\n+showcontent = true\n+\n+[tool.isort]\n+profile = "plone"\ndiff --git a/src/plone/testing/zodb.rst b/src/plone/testing/zodb.rst\nindex 6a9cf73..a18c473 100644\n--- a/src/plone/testing/zodb.rst\n+++ b/src/plone/testing/zodb.rst\n@@ -53,7 +53,7 @@ Let\'s now simulate a test.::\n The test would then execute. It may use the ZODB root.::\n \n >>> zodb.EMPTY_ZODB[\'zodbConnection\']\n- \n+ <...Connection...at ...>\n \n >>> zodb.EMPTY_ZODB[\'zodbRoot\']\n {}\n@@ -136,7 +136,7 @@ Let\'s now simulate a test.::\n The test would then execute. It may use the ZODB root.::\n \n >>> POPULATED_ZODB[\'zodbConnection\']\n- \n+ <...Connection...at ...>\n \n >>> POPULATED_ZODB[\'zodbRoot\']\n {\'someData\': \'a string\'}\n@@ -231,7 +231,7 @@ Let\'s now simulate a test.::\n The test would then execute. It may use the ZODB root.::\n \n >>> EXPANDED_ZODB[\'zodbConnection\']\n- \n+ <...Connection...at ...>\n \n >>> EXPANDED_ZODB[\'zodbRoot\'] == dict(someData=\'a string\', additionalData=\'Some new data\')\n True\n'