[Checkins] SVN: zope.site/trunk/ Fixed tests and get ready for release.
Stephan Richter
srichter at gmail.com
Fri Jul 24 01:01:19 EDT 2009
Log message for revision 102191:
Fixed tests and get ready for release.
Changed:
U zope.site/trunk/CHANGES.txt
U zope.site/trunk/setup.py
_U zope.site/trunk/src/
U zope.site/trunk/src/zope/site/testing.py
U zope.site/trunk/src/zope/site/tests/test_localsitemanager.py
U zope.site/trunk/src/zope/site/tests/test_registration.py
-=-
Modified: zope.site/trunk/CHANGES.txt
===================================================================
--- zope.site/trunk/CHANGES.txt 2009-07-23 21:00:01 UTC (rev 102190)
+++ zope.site/trunk/CHANGES.txt 2009-07-24 05:01:18 UTC (rev 102191)
@@ -2,14 +2,19 @@
CHANGES
=======
-3.6.2 (unreleased)
+3.6.2 (2009-07-24)
------------------
+- Fixed tests to pass with latest packages.
+
+- Removed failing test of persistent interfaces, since it did not test
+ anything in this package and used the deprecated ``zodbcode`` module.
+
- Fix NameError when calling ``zope.site.testing.siteSetUp(site=True)``.
-- The getNextUtility and queryNextUtility functions was moved to zope.component.
- While backward-compatibility imports are provided, it's strongly recommended
- to update your imports.
+- The ``getNextUtility`` and ``queryNextUtility`` functions was moved to
+ ``zope.component``. While backward-compatibility imports are provided, it's
+ strongly recommended to update your imports.
3.6.1 (2009-02-28)
------------------
Modified: zope.site/trunk/setup.py
===================================================================
--- zope.site/trunk/setup.py 2009-07-23 21:00:01 UTC (rev 102190)
+++ zope.site/trunk/setup.py 2009-07-24 05:01:18 UTC (rev 102191)
@@ -22,7 +22,7 @@
return open(os.path.join(os.path.dirname(__file__), *rnames)).read()
setup(name='zope.site',
- version = '3.6.2dev',
+ version = '3.6.2',
author='Zope Corporation and Contributors',
author_email='zope-dev at zope.org',
description='Local registries for zope component architecture',
@@ -53,7 +53,8 @@
package_dir = {'': 'src'},
namespace_packages=['zope'],
extras_require=dict(
- test=['zope.app.testing',]),
+ test=['zope.app.testing',
+ 'zope.copypastemove']),
install_requires=[
'setuptools',
'zope.annotation',
Property changes on: zope.site/trunk/src
___________________________________________________________________
Modified: svn:ignore
- zope.app.component.egg-info
+ zope.site.egg-info
Modified: zope.site/trunk/src/zope/site/testing.py
===================================================================
--- zope.site/trunk/src/zope/site/testing.py 2009-07-23 21:00:01 UTC (rev 102190)
+++ zope.site/trunk/src/zope/site/testing.py 2009-07-24 05:01:18 UTC (rev 102191)
@@ -13,20 +13,17 @@
##############################################################################
"""Reusable functionality for testing site-related code
"""
-
import zope.component
+import zope.site.hooks
+from zope.app.testing.placelesssetup import setUp as placelessSetUp
+from zope.app.testing.placelesssetup import tearDown as placelessTearDown
from zope.component.interfaces import IComponentLookup
from zope.interface import Interface
-
+from zope.location.interfaces import ISite
from zope.site import LocalSiteManager, SiteManagerAdapter
from zope.site.folder import rootFolder
-from zope.location.interfaces import ISite
from zope.site.hooks import setSite
-import zope.site.hooks
-from zope.app.testing.placelesssetup import setUp as placelessSetUp
-from zope.app.testing.placelesssetup import tearDown as placelessTearDown
-
def createSiteManager(folder, setsite=False):
if not ISite.providedBy(folder):
folder.setSiteManager(LocalSiteManager(folder))
@@ -50,8 +47,8 @@
placelessSetUp()
zope.site.hooks.setHooks()
- zope.component.provideAdapter(SiteManagerAdapter, (Interface,),
- IComponentLookup)
+ zope.component.provideAdapter(
+ SiteManagerAdapter, (Interface,), IComponentLookup)
if site:
site = rootFolder()
Modified: zope.site/trunk/src/zope/site/tests/test_localsitemanager.py
===================================================================
--- zope.site/trunk/src/zope/site/tests/test_localsitemanager.py 2009-07-23 21:00:01 UTC (rev 102190)
+++ zope.site/trunk/src/zope/site/tests/test_localsitemanager.py 2009-07-24 05:01:18 UTC (rev 102191)
@@ -39,12 +39,14 @@
subfolder.getSiteManager().registerUtility(self.util, I1)
def testCopy(self):
- self.assert_(self.root['site'].getSiteManager().getUtility(I1) is self.util)
+ self.assert_(
+ self.root['site'].getSiteManager().getUtility(I1) is self.util)
copier = ObjectCopier(self.root['site'])
copier.copyTo(self.root, 'copied_site')
- self.assert_(self.root['copied_site'].getSiteManager().getUtility(I1) is not self.util)
+ self.assert_(
+ self.root['copied_site'].getSiteManager().getUtility(I1) is not self.util)
def test_suite():
return unittest.TestSuite((
Modified: zope.site/trunk/src/zope/site/tests/test_registration.py
===================================================================
--- zope.site/trunk/src/zope/site/tests/test_registration.py 2009-07-23 21:00:01 UTC (rev 102190)
+++ zope.site/trunk/src/zope/site/tests/test_registration.py 2009-07-24 05:01:18 UTC (rev 102191)
@@ -17,26 +17,23 @@
"""
__docformat__ = "reStructuredText"
+import ZODB.FileStorage
import os
+import persistent
+import transaction
import unittest
import warnings
-
-from ZODB.DB import DB
-import ZODB.FileStorage
-from ZODB.DemoStorage import DemoStorage
-import transaction
-import persistent
-
import zope.component.globalregistry
import zope.component.testing as placelesssetup
-from zope.testing import doctest
-from zope.app.testing import setup
import zope.container.contained
+import zope.site
+from ZODB.DB import DB
+from ZODB.DemoStorage import DemoStorage
from zope import interface
+from zope.app.testing import setup
+from zope.testing import doctest
-import zope.site
-
# test class for testing data conversion
class IFoo(interface.Interface):
pass
@@ -67,7 +64,7 @@
# Work around a bug in ZODB
# XXX fix ZODB
class FileStorage(ZODB.FileStorage.FileStorage):
-
+
def new_oid(self):
self._lock_acquire()
try:
@@ -82,7 +79,7 @@
return last
finally:
self._lock_release()
-
+
class GlobalRegistry:
pass
@@ -91,15 +88,15 @@
GlobalRegistry.adapters = base
def clear_base():
base.__init__(GlobalRegistry, 'adapters')
-
-
+
+
def test_deghostification_of_persistent_adapter_registries():
"""
Note that this test duplicates one from zope.component.tests.
We should be able to get rid of this one when we get rid of
__setstate__ implementation we have in back35.
-
+
We want to make sure that we see updates corrextly.
>>> import ZODB.tests.util
@@ -136,7 +133,7 @@
>>> r2.lookup((), IFoo, '2')
>>> base.register((), IFoo, '2', Foo('2'))
-
+
>>> r1.lookup((), IFoo, '2')
Foo('2')
@@ -150,81 +147,6 @@
"""
-barcode = """
-from zope.interface import Interface
-class IBar(Interface): pass
-class IBaz(Interface): pass
-"""
-
-class Bar(persistent.Persistent): pass
-class Baz(persistent.Persistent): pass
-
-def test_persistent_interfaces():
- """
-Registrations for persistent interfaces are accessible from separate
-connections.
-
-Setup the DB and our first connection::
-
- >>> import ZODB.tests.util
- >>> db = ZODB.tests.util.DB()
- >>> conn1 = db.open()
- >>> root1 = conn1.root()
-
-Setup the persistent module registry and the local component
-registry::
-
- >>> from zodbcode.module import ManagedRegistry
- >>> registry = root1['registry'] = ManagedRegistry()
- >>> from zope.component.persistentregistry import PersistentComponents
- >>> manager = root1['manager'] = PersistentComponents()
-
-Create a persistent module::
-
- >>> registry.newModule('barmodule', barcode)
- >>> barmodule = registry.findModule('barmodule')
-
-Create a persistent instance::
-
- >>> bar = root1['bar'] = Bar()
- >>> from zope.interface import directlyProvides
- >>> directlyProvides(bar, barmodule.IBar)
- >>> from transaction import commit
- >>> commit()
-
-Register an adapter::
-
- >>> manager.queryAdapter(bar, barmodule.IBaz)
- >>> manager.registerAdapter(Baz, [barmodule.IBar], barmodule.IBaz)
- >>> manager.getAdapter(bar, barmodule.IBaz) # doctest: +ELLIPSIS
- <zope.site.tests.test_registration.Baz object at ...>
-
-Before commit, the adapter is not available from another connection::
-
- >>> conn2 = db.open()
- >>> root2 = conn2.root()
- >>> registry2 = root2['registry']
- >>> barmodule2 = registry2.findModule('barmodule')
- >>> bar2 = root2['bar']
- >>> manager2 = root2['manager']
- >>> manager2.queryAdapter(bar2, barmodule2.IBaz)
-
-After commit, it is::
-
- >>> commit()
- >>> conn2.sync()
- >>> manager2.getAdapter(bar2, barmodule2.IBaz)
- ... # doctest: +ELLIPSIS
- <zope.site.tests.test_registration.Baz object at ...>
-
-Cleanup::
-
- >>> conn1.close()
- >>> conn2.close()
- >>> db.close()
-"""
-
-
def test_suite():
suite = unittest.TestSuite((
doctest.DocTestSuite(setUp=setUp, tearDown=tearDown)
More information about the Checkins
mailing list