[MERGE] fix blackbox failures when run from windows executable

[Mark Hammond]

Third-time lucky :)

> It happens with your first patch too.  Either way I get a failure like:
> 
> Traceback (most recent call last):
>   File
> "/home/andrew/warthogs/bzr/mhammond/bzrlib/tests/test_plugins.py", line
> 474, in test_set_plugins_path_with_trailing_slashes
>     bzrlib.plugins.__path__[:len(expected_path)])
> AssertionError: not equal:
> a = ['first', 'second', '/usr/lib/python2.5/site-
> packages/bzrlib/plugins']
> b = ['first', 'second',
> '/home/andrew/warthogs/bzr/mhammond/bzrlib/plugins']
> 
> Maybe this due to running the test suite out of a checkout while also
> having bzrlib installed system wide?

The problems we are running in to are predicting what the rest of
plugins.__path__ is - but the test is explicitly checking that trailing
slashes on user-specified paths are removed.  I reckon the best bet is to
restrict the test to checking only that, which is what I did.  I even tested
it works on Linux :)

The patch also includes John's suggestion: use osutils.realpath instead of
os.path.realpath in test_bzrdir.py and this also passes on both platforms
for me.

Thanks,

Mark
-------------- next part --------------
A non-text attachment was scrubbed...
Name: windows_blackbox_failures.patch
Type: application/octet-stream
Size: 14482 bytes
Desc: not available
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20080812/868fc8d9/attachment.obj