[Checkins] SVN: Zope3/trunk/src/ Get test to pass on Mac. Any other ideas?

Gary Poster gary at zope.com
Tue Feb 6 00:18:00 EST 2007


Darn!

This log message ("Get test to pass on Mac.  Any other ideas?") was  
supposed to accompany Zope3/trunk/src/zope/component/tests.py

The log message for the change to Zope3/trunk/src/zope/app/interface/ 
tests/test_interface.py would have been "harden test".

The log message for the rest of the checkin would have been "switch  
to using most recent ZODB trunk--blobs, L-BTrees and associated  
changes."

Gary

On Feb 6, 2007, at 12:14 AM, Gary Poster wrote:

> Log message for revision 72389:
>   Get test to pass on Mac.  Any other ideas?
>
> Changed:
>   _U  Zope3/trunk/src/
>   U   Zope3/trunk/src/zodbcode/tests/test_patch.py
>   U   Zope3/trunk/src/zope/app/apidoc/codemodule/browser/README.txt
>   U   Zope3/trunk/src/zope/app/apidoc/codemodule/browser/ 
> introspector.txt
>   U   Zope3/trunk/src/zope/app/catalog/README.txt
>   U   Zope3/trunk/src/zope/app/interface/tests/test_interface.py
>   U   Zope3/trunk/src/zope/component/tests.py
>
> -=-
>
> Property changes on: Zope3/trunk/src
> ___________________________________________________________________
> Name: svn:externals
>    - docutils       svn://svn.zope.org/repos/main/docutils/tags/0.4.0
> ZConfig        svn://svn.zope.org/repos/main/ZConfig/trunk/ZConfig
> BTrees         -r 72313 svn://svn.zope.org/repos/main/ZODB/branches/ 
> 3.7/src/BTrees
> persistent     -r 72313 svn://svn.zope.org/repos/main/ZODB/branches/ 
> 3.7/src/persistent
> ThreadedAsync  -r 72313 svn://svn.zope.org/repos/main/ZODB/branches/ 
> 3.7/src/ThreadedAsync
> transaction    -r 72313 svn://svn.zope.org/repos/main/ZODB/branches/ 
> 3.7/src/transaction
> ZEO            -r 72313 svn://svn.zope.org/repos/main/ZODB/branches/ 
> 3.7/src/ZEO
> ZODB           -r 72313 svn://svn.zope.org/repos/main/ZODB/branches/ 
> 3.7/src/ZODB
> twisted        svn://svn.twistedmatrix.com/svn/Twisted/tags/ 
> releases/twisted-core-2.5.0/twisted
> zdaemon        -r 40792 svn://svn.zope.org/repos/main/zdaemon/trunk/ 
> src/zdaemon
>
>
>    + docutils       svn://svn.zope.org/repos/main/docutils/tags/0.4.0
> ZConfig        svn://svn.zope.org/repos/main/ZConfig/trunk/ZConfig
> BTrees         -r 72385 svn://svn.zope.org/repos/main/ZODB/trunk/ 
> src/BTrees
> persistent     -r 72385 svn://svn.zope.org/repos/main/ZODB/trunk/ 
> src/persistent
> ThreadedAsync  -r 72385 svn://svn.zope.org/repos/main/ZODB/trunk/ 
> src/ThreadedAsync
> transaction    -r 72385 svn://svn.zope.org/repos/main/ZODB/trunk/ 
> src/transaction
> ZEO            -r 72385 svn://svn.zope.org/repos/main/ZODB/trunk/ 
> src/ZEO
> ZODB           -r 72385 svn://svn.zope.org/repos/main/ZODB/trunk/ 
> src/ZODB
> twisted        svn://svn.twistedmatrix.com/svn/Twisted/tags/ 
> releases/twisted-core-2.5.0/twisted
> zdaemon        -r 40792 svn://svn.zope.org/repos/main/zdaemon/trunk/ 
> src/zdaemon
>
>
>
> Modified: Zope3/trunk/src/zodbcode/tests/test_patch.py
> ===================================================================
> --- Zope3/trunk/src/zodbcode/tests/test_patch.py	2007-02-06  
> 03:02:58 UTC (rev 72388)
> +++ Zope3/trunk/src/zodbcode/tests/test_patch.py	2007-02-06  
> 05:14:32 UTC (rev 72389)
> @@ -65,7 +65,7 @@
>          # The patch should not touch modules, functions, etc. that
>          # are imported from other modules.
>          import ZODB.utils
> -        for name in dir(ZODB.utils):
> +        for name in ZODB.utils.__all__:
>              obj = getattr(ZODB.utils, name)
>              if isinstance(obj, type) or isinstance(obj, function):
>                  self.assert_(obj is newdict[name])
>
> Modified: Zope3/trunk/src/zope/app/apidoc/codemodule/browser/ 
> README.txt
> ===================================================================
> --- Zope3/trunk/src/zope/app/apidoc/codemodule/browser/README.txt	 
> 2007-02-06 03:02:58 UTC (rev 72388)
> +++ Zope3/trunk/src/zope/app/apidoc/codemodule/browser/README.txt	 
> 2007-02-06 05:14:32 UTC (rev 72389)
> @@ -518,8 +518,8 @@
>      'name': 'data',
>      'read_perm': None,
>      'type': 'OOBTree',
> -    'type_link': 'BTrees/_OOBTree/OOBTree',
> -    'value': '<BTrees._OOBTree.OOBTree object at ...>',
> +    'type_link': 'BTrees/OOBTree/OOBTree',
> +    'value': '<BTrees.OOBTree.OOBTree object at ...>',
>      'value_linkable': True,
>      'write_perm': None}]
>
>
> Modified: Zope3/trunk/src/zope/app/apidoc/codemodule/browser/ 
> introspector.txt
> ===================================================================
> --- Zope3/trunk/src/zope/app/apidoc/codemodule/browser/ 
> introspector.txt	2007-02-06 03:02:58 UTC (rev 72388)
> +++ Zope3/trunk/src/zope/app/apidoc/codemodule/browser/ 
> introspector.txt	2007-02-06 05:14:32 UTC (rev 72389)
> @@ -82,7 +82,7 @@
>          ...
>          <br />
>          <i>Value:</i>
> -        <code>&lt;BTrees._OOBTree.OOBTree object at ...&gt;</code>
> +        <code>&lt;BTrees.OOBTree.OOBTree object at ...&gt;</code>
>          <br />
>          <span class="small">
>            <i>Permissions:</i>
>
> Modified: Zope3/trunk/src/zope/app/catalog/README.txt
> ===================================================================
> --- Zope3/trunk/src/zope/app/catalog/README.txt	2007-02-06 03:02:58  
> UTC (rev 72388)
> +++ Zope3/trunk/src/zope/app/catalog/README.txt	2007-02-06 05:14:32  
> UTC (rev 72389)
> @@ -291,14 +291,14 @@
>  When we apply the catalog:
>
>>>> cat.apply({'hobbies': ['music', 'camping', 'sailing']})
> -    BTrees._IFBTree.IFBucket([(1, 2.0), (2, 1.0), (3, 3.0)])
> +    BTrees.IFBTree.IFBucket([(1, 2.0), (2, 1.0), (3, 3.0)])
>
>  We found objects 1-3, because they each contained at least some of  
> the
>  words in the query.  The scores represent the number of words that
>  matched. If we also include age:
>
>>>> cat.apply({'hobbies': ['music', 'camping', 'sailing'], 'age': 10})
> -    BTrees._IFBTree.IFBucket([(1, 3.0)])
> +    BTrees.IFBTree.IFBucket([(1, 3.0)])
>
>  The score increased because we used an additional index.  If an index
>  doesn't provide scores, scores of 1.0 are assumed.
>
> Modified: Zope3/trunk/src/zope/app/interface/tests/test_interface.py
> ===================================================================
> --- Zope3/trunk/src/zope/app/interface/tests/test_interface.py	 
> 2007-02-06 03:02:58 UTC (rev 72388)
> +++ Zope3/trunk/src/zope/app/interface/tests/test_interface.py	 
> 2007-02-06 05:14:32 UTC (rev 72389)
> @@ -29,7 +29,7 @@
>  from zodbcode.module import ManagedRegistry
>
>  from zope.interface import Interface, implements, directlyProvides
> -from zope.app.interface import PersistentInterface
> +from zope.app.interface import PersistentInterface,  
> PersistentProvidesClass
>
>  # TODO: for some reason changing this code to use implements()  
> does not
>  # work. This is due to a bug that is supposed to be fixed after X3.0.
> @@ -161,9 +161,9 @@
>      def test_persistentDeclarations(self):
>          """Verify equivalency of persistent declarations
>
> -        Make sure that the persistent declaration instance are
> -        equivalent to the non-persistent instances they originate
> -        from."""
> +        Make sure that the persistent declaration instances are
> +        equivalent to the non-persistent instances from which they
> +        originate."""
>
>          self.registry.newModule("barmodule", bar_code)
>          barmodule = self.registry.findModule("barmodule")
> @@ -174,13 +174,21 @@
>          bar = Bar()
>          directlyProvides(bar, barmodule.IBar)
>
> +        dep_keys = barmodule.IBar.dependents.keys()
> +         # keys are not in a reliable order, esp. across  
> platforms, so have
> +         # fun sniffing...
> +        if isinstance(dep_keys[0], PersistentProvidesClass):
> +            dep_provides, dep_implements = dep_keys
> +        else:
> +            dep_implements, dep_provides = dep_keys
> +
>          self.assertEqual(
>              bar.__provides__._Provides__args,
> -            barmodule.IBar.dependents.keys()[0]._Provides__args
> +            dep_provides._Provides__args
>              )
>          self.assertEqual(
>              Baz.__implemented__.__bases__,
> -            barmodule.IBar.dependents.keys()[1].__bases__
> +            dep_implements.__bases__
>              )
>
>  def test_suite():
>
> Modified: Zope3/trunk/src/zope/component/tests.py
> ===================================================================
> --- Zope3/trunk/src/zope/component/tests.py	2007-02-06 03:02:58 UTC  
> (rev 72388)
> +++ Zope3/trunk/src/zope/component/tests.py	2007-02-06 05:14:32 UTC  
> (rev 72389)
> @@ -970,7 +970,11 @@
>          pickle.dump(sys.path, process.stdin)
>          process.stdin.close()
>
> -        process.wait()
> +        try:
> +            process.wait()
> +        except OSError, e:
> +            if e.errno != 4: # MacIntel raises apparently  
> unimportant EINTR?
> +                raise # TODO verify sanity of a pass on EINTR :-/
>          lines = process.stdout.readlines()
>          process.stdout.close()
>          for l in reversed(lines):
>
> _______________________________________________
> Checkins mailing list
> Checkins at zope.org
> http://mail.zope.org/mailman/listinfo/checkins



More information about the Checkins mailing list