[Zope-dev] Re: [Zope-Checkins] CVS: Zope - test.py:1.2.2.16

[Florent Guillaume]

Stefan H. Holek wrote:
> Sorry Florent, I missed your warning mail.
> 
> I have two issues with the patch:
> 
> a) Trailing slash no longer works (--libdir Products/)

This is probably fixable by an explicit test.

> b) Some combinations of --libdir and --dir and symlinks no longer work 
> on Mac OS X (HFS)

Could you give detail so I can reproduce it ?

> Unfortunately os.getcwd() returns different paths in the presence of 
> symlinks on Mac and Linux (already realpath'd vs not). I don't have a 
> good solution for this either.

 > You have a Mac haven't you? Does it work for you across all platforms?

The tests I did worked, but I may not have fully tested the symlinks 
problems (I had them and fixed them on Linux).

My Mac is at home, I'll test tonight.

Florent
> 
> Thanks,
> Stefan
> 
> 
> On 19. Nov 2004, at 14:49, Florent Guillaume wrote:
> 
>> Update of /cvs-repository/Zope
>> In directory cvs.zope.org:/tmp/cvs-serv20719
>>
>> Modified Files:
>>       Tag: Zope-2_7-branch
>>     test.py
>> Log Message:
>> Fixed to work in the presence of symliked products or Products directory.
>>
>>
>> === Zope/test.py 1.2.2.15 => 1.2.2.16 ===
>> --- Zope/test.py:1.2.2.15    Sat Oct 30 04:29:22 2004
>> +++ Zope/test.py    Fri Nov 19 08:48:59 2004
>> @@ -380,11 +380,12 @@
>>          self.cwd = os.path.realpath(os.getcwd())
>>          # Hack again for external products.
>>          if libdir:
>> -            self.libdir = os.path.realpath(os.path.join(self.cwd, 
>> libdir))
>> +            self.libdir = os.path.join(self.cwd, libdir)
>>          else:
>> -            self.libdir = os.path.realpath(os.path.join(self.cwd, 
>> self.libdir))
>> -        if self.libdir not in sys.path:
>> -            sys.path.insert(0, self.libdir)
>> +            self.libdir = os.path.join(self.cwd, self.libdir)
>> +        real_libdir = os.path.realpath(self.libdir)
>> +        if real_libdir not in sys.path:
>> +            sys.path.insert(0, real_libdir)
>>          # Determine where to look for tests
>>          if test_dir:
>>              self.testdir = os.path.abspath(os.path.join(self.cwd, 
>> test_dir))
>>
>> _______________________________________________
>> Zope-Checkins maillist  -  Zope-Checkins at zope.org
>> http://mail.zope.org/mailman/listinfo/zope-checkins
>>
> -- 
> The time has come to start talking about whether the emperor is as well
> dressed as we are supposed to think he is.               /Pete McBreen/
> 


-- 
Florent Guillaume, Nuxeo (Paris, France)   CTO, Director of R&D
+33 1 40 33 71 59   http://nuxeo.com   fg at nuxeo.com