From 09c56684bc298b9793893233b4659d94516a6bf7 Mon Sep 17 00:00:00 2001 From: Maurits van Rees Date: Tue, 30 Apr 2024 15:40:38 +0200 Subject: [PATCH] Removed tests for Zope Replication Services. The recipe support should still work, but the tests are broken. Note that the `zc.zrs` project is currently unmaintained, so if you rely on this, please step up. Fixes https://github.com/plone/plone.recipe.zeoserver/issues/52. --- news/52.tests | 5 ++ setup.py | 2 + .../recipe/zeoserver/tests/zeoserver.txt | 72 ------------------- 3 files changed, 7 insertions(+), 72 deletions(-) create mode 100644 news/52.tests diff --git a/news/52.tests b/news/52.tests new file mode 100644 index 0000000..6a8eff1 --- /dev/null +++ b/news/52.tests @@ -0,0 +1,5 @@ +Removed tests for Zope Replication Services. +The recipe support should still work, but the tests are broken. +Note that the `zc.zrs` project is currently unmaintained, so if you rely on this, please step up. +See `issue 52 `_. +[maurits] diff --git a/setup.py b/setup.py index fe70e26..6472653 100644 --- a/setup.py +++ b/setup.py @@ -29,6 +29,7 @@ "Framework :: Buildout", "Framework :: Plone", "Framework :: Plone :: 6.0", + "Framework :: Plone :: 6.1", "Framework :: Zope", "Framework :: Zope :: 5", "Programming Language :: Python", @@ -36,6 +37,7 @@ "Programming Language :: Python :: 3.9", "Programming Language :: Python :: 3.10", "Programming Language :: Python :: 3.11", + "Programming Language :: Python :: 3.12", "Programming Language :: Python :: Implementation", "Programming Language :: Python :: Implementation :: CPython", ], diff --git a/src/plone/recipe/zeoserver/tests/zeoserver.txt b/src/plone/recipe/zeoserver/tests/zeoserver.txt index 9cfd184..0548cc3 100644 --- a/src/plone/recipe/zeoserver/tests/zeoserver.txt +++ b/src/plone/recipe/zeoserver/tests/zeoserver.txt @@ -82,78 +82,6 @@ We should have a basic zeo.conf:: -Zope Replication Services -========================= - -Now, let's create a simple buildout to create a primary replication:: - - >>> primaryzrs = ''' - ... [buildout] - ... parts = zeo - ... find-links = %(sample_buildout)s/eggs - ... - ... [zeo] - ... recipe = plone.recipe.zeoserver[zrs] - ... replicate-to = 127.0.0.1:5000 - ... ''' % globals() - >>> write('buildout.cfg', primaryzrs) - >>> print(system(join('bin', 'buildout'))) - ... - Uninstalling zeo. - Installing zeo. - ... - -We should have primary zrs config in zeo.conf:: - - >>> zeo = os.path.join(sample_buildout, 'parts', 'zeo') - >>> with open(os.path.join(zeo, 'etc', 'zeo.conf')) as f: - ... print(f.read()) - %define INSTANCE ... - ... - %import zc.zrs - - - replicate-to 127.0.0.1:5000 - ... - - ... - - -And for a secondary:: - - >>> primaryzrs = ''' - ... [buildout] - ... parts = zeo - ... find-links = %(sample_buildout)s/eggs - ... - ... [zeo] - ... recipe = plone.recipe.zeoserver[zrs] - ... replicate-from = 127.0.0.1:5000 - ... ''' % globals() - >>> write('buildout.cfg', primaryzrs) - >>> print(system(join('bin', 'buildout'))) - ... - Uninstalling zeo. - Installing zeo. - ... - -We should have primary zrs config in zeo.conf:: - - >>> zeo = os.path.join(sample_buildout, 'parts', 'zeo') - >>> with open(os.path.join(zeo, 'etc', 'zeo.conf')) as f: - ... print(f.read()) - %define INSTANCE ... - ... - %import zc.zrs - - - replicate-from 127.0.0.1:5000 - ... - - ... - - - Custom Zeo log ==============