Skip to content

Commit

Permalink
Merge pull request #54 from plone/maurits-no-zrs-tests
Browse files Browse the repository at this point in the history 
Removed tests for Zope Replication Services.
  • Loading branch information
@mauritsvanrees
mauritsvanrees authored May 6, 2024
2 parents db1a3a6 + 09c5668 commit 9302466
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 72 deletions.
5 changes: 5 additions & 0 deletions news/52.tests
View file
Original file line number Diff line number Diff line change
@@ -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 <https://github.com/plone/plone.recipe.zeoserver/issues/52>`_.
[maurits]
2 changes: 2 additions & 0 deletions setup.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,13 +29,15 @@
"Framework :: Buildout",
"Framework :: Plone",
"Framework :: Plone :: 6.0",
"Framework :: Plone :: 6.1",
"Framework :: Zope",
"Framework :: Zope :: 5",
"Programming Language :: Python",
"Programming Language :: Python :: 3.8",
"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",
],
Expand Down
72 changes: 0 additions & 72 deletions src/plone/recipe/zeoserver/tests/zeoserver.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -82,78 +82,6 @@ We should have a basic zeo.conf::
<BLANKLINE>


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
<BLANKLINE>
<zrs 1>
replicate-to 127.0.0.1:5000
...
<filestorage 1>
...
<BLANKLINE>

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
<BLANKLINE>
<zrs 1>
replicate-from 127.0.0.1:5000
...
<filestorage 1>
...
<BLANKLINE>


Custom Zeo log
==============

Expand Down

0 comments on commit 9302466

Please sign in to comment.