[merge] look for plugins in arch-independent site directory (was Re: Bundling more plugins into bzrtools)

[Toshio Kuratomi]

Alexander Belchenko wrote:
> Alexander Belchenko has voted resubmit.
> Status is now: Resubmit
> Comment:
> Toshio, I'm trying to merge your patch, but unfortunately it breaks test 
> suite. You should update failed test as well.
> 
> ======================================================================
> FAIL: test_set_plugins_path_with_trailing_slashes 
> (bzrlib.tests.test_plugins.TestSetPluginsPath)
> 
> vvvv[log from 
> bzrlib.tests.test_plugins.TestSetPluginsPath.test_set_plugins_path_with_trailing_slashes] 
> 
> 
> ^^^^[log from 
> bzrlib.tests.test_plugins.TestSetPluginsPath.test_set_plugins_path_with_trailing_slashes] 

Thanks!  Updated patch with changes to the test suite attached.

I took the following approach:

For set_plugins_path_with_trailing_slashes I changed the check to assert 
if expected_path does not match the beginning of the generated path. 
This keeps the complications surrounding whether distutils exists, 
platform, and such out of that test.  I added a different test to check 
that set_plugins() returns the directories that we're expecting with 
logic for the arch-independent directory.

The test case has been checked on i386 (py2.5) and x86_64-multilib (py-2.4).

-Toshio
-------------- next part --------------
A non-text attachment was scrubbed...
Name: bzr-arch-indep-plugins2.patch
Type: text/x-patch
Size: 3520 bytes
Desc: not available
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20080225/55bbeb14/attachment.bin 
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 189 bytes
Desc: OpenPGP digital signature
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20080225/55bbeb14/attachment.pgp