[MERGE] Stop treating Permission Denied as lock contention

[Alexander Belchenko]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

John Arbash Meinel пишет:
> John Arbash Meinel has voted +1 (conditional).
> Status is now: Conditionally approved
> Comment:
> lets get someone to test this on win32
> 
> Alexander?
> 
> For details, see:
> http://bundlebuggy.aaronbentley.com/request/%3C45C0E549.4060408%40utoronto.ca%3E
> 
> 
> 
C:\work\Bazaar\sandbox\aaron>python bzr --no-plugins selftest test_lock_permission -v
           21:15
       bzr: C:/work/Bazaar/sandbox/aaron/bzr
    bzrlib: C:\work\Bazaar\sandbox\aaron\bzrlib

C:\work\Bazaar\sandbox\aaron\bzrlib\transport\ftp.py:729: UserWarning: You must install medusa
(http://www.amk.ca/py
thon/code/medusa.html) for FTP tests
  warn("You must install medusa (http://www.amk.ca/python/code/medusa.html) for FTP tests")
running 1 tests...
test_lockdir.TestLockDir.test_lock_permission                                          FAIL
        608ms
    PermissionDenied not raised

======================================================================
FAIL: test_lock_permission (bzrlib.tests.test_lockdir.TestLockDir)

vvvv[log from bzrlib.tests.test_lockdir.TestLockDir.test_lock_permission]-----
created control directory in file:///C:/work/Bazaar/sandbox/aaron/test0000.tmp/
creating repository in file:///C:/work/Bazaar/sandbox/aaron/test0000.tmp/.bzr/.
creating branch <bzrlib.branch.BzrBranchFormat5 object at 0x00E46B10> in
file:///C:/work/Bazaar/sandbox/aaron/test00
00.tmp/.bzr/
got branch format Bazaar-NG Metadir branch format 5
got branch format Bazaar-NG Metadir branch format 5
opening working tree 'C:/work/Bazaar/sandbox/aaron/test0000.tmp'
failed to open C:/work/Bazaar/sandbox/aaron/test0000.tmp/.bzr/checkout/stat-cache: [Errno 2] No such
file or directo
ry: u'C:/work/Bazaar/sandbox/aaron/test0000.tmp/.bzr/checkout/stat-cache'
write hc

^^^^[log from bzrlib.tests.test_lockdir.TestLockDir.test_lock_permission]-----
- ----------------------------------------------------------------------
Traceback (most recent call last):
  File "C:\work\Bazaar\sandbox\aaron\bzrlib\tests\test_lockdir.py", line 611, in test_lock_permission
    self.assertRaises(errors.PermissionDenied, ld1.attempt_lock)
AssertionError: PermissionDenied not raised

- ----------------------------------------------------------------------
Ran 1 test in 0.672s

FAILED (failures=1)
tests failed
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.6 (MingW32)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iD8DBQFFwOrdzYr338mxwCURAgCGAJ9jdxwczzKcDiE+PAsrGY2vj8DgJwCeOkuT
9AoU4PpyqqlFiOrA3/ItWz0=
=mJoN
-----END PGP SIGNATURE-----