168
188
"took %f seconds to detect lock contention" % (after - before))
191
lock_base = lf2.transport.abspath(lf2.path)
192
self.assertEqual(1, len(self._logged_reports))
193
lock_url = lf2.transport.abspath(lf2.path)
194
self.assertEqual('%s %s\n'
196
'Will continue to try until %s, unless '
198
'If you\'re sure that it\'s not being '
199
'modified, use bzr break-lock %s',
200
self._logged_reports[0][0])
201
args = self._logged_reports[0][1]
202
self.assertEqual('Unable to obtain', args[0])
203
self.assertEqual('lock %s' % (lock_base,), args[1])
204
self.assertStartsWith(args[2], 'held by ')
205
self.assertStartsWith(args[3], 'locked ')
206
self.assertEndsWith(args[3], ' ago')
207
self.assertContainsRe(args[4], r'\d\d:\d\d:\d\d')
172
209
def test_31_lock_wait_easy(self):
173
210
"""Succeed when waiting on a lock with no contention.
212
def test_33_wait(self):
213
"""Succeed when waiting on a lock that gets released
262
# There should be only 1 report, even though it should have to
264
lock_base = lf2.transport.abspath(lf2.path)
265
self.assertEqual(1, len(self._logged_reports))
266
self.assertEqual('%s %s\n'
268
'Will continue to try until %s\n',
269
self._logged_reports[0][0])
270
args = self._logged_reports[0][1]
271
self.assertEqual('Unable to obtain', args[0])
272
self.assertEqual('lock %s' % (lock_base,), args[1])
273
self.assertStartsWith(args[2], 'held by ')
274
self.assertStartsWith(args[3], 'locked ')
275
self.assertEndsWith(args[3], ' ago')
276
self.assertContainsRe(args[4], r'\d\d:\d\d:\d\d')
215
The difference from test_32_lock_wait_succeed is that the second
216
caller does not actually acquire the lock, but just waits for it
217
to be released. This is done over a readonly transport.
278
def test_34_lock_write_waits(self):
279
"""LockDir.lock_write() will wait for the lock."""
280
# the test suite sets the default to 0 to make deadlocks fail fast.
281
# change it for this test, as we want to try a manual deadlock.
282
raise tests.TestSkipped('Timing-sensitive test')
283
bzrlib.lockdir._DEFAULT_TIMEOUT_SECONDS = 300
219
284
t = self.get_transport()
220
285
lf1 = LockDir(t, 'test_lock')
227
292
unlocker = Thread(target=wait_and_unlock)
230
lf2 = LockDir(self.get_readonly_transport(), 'test_lock')
295
lf2 = LockDir(t, 'test_lock')
296
self.setup_log_reporter(lf2)
231
297
before = time.time()
232
# wait but don't lock
233
lf2.wait(timeout=0.4, poll=0.1)
234
300
after = time.time()
235
self.assertTrue(after - before <= 1.0)
304
# There should be only 1 report, even though it should have to
306
lock_base = lf2.transport.abspath(lf2.path)
307
self.assertEqual(1, len(self._logged_reports))
308
self.assertEqual('%s %s\n'
310
'Will continue to try until %s\n',
311
self._logged_reports[0][0])
312
args = self._logged_reports[0][1]
313
self.assertEqual('Unable to obtain', args[0])
314
self.assertEqual('lock %s' % (lock_base,), args[1])
315
self.assertStartsWith(args[2], 'held by ')
316
self.assertStartsWith(args[3], 'locked ')
317
self.assertEndsWith(args[3], ' ago')
318
self.assertContainsRe(args[4], r'\d\d:\d\d:\d\d')
320
def test_35_wait_lock_changing(self):
321
"""LockDir.wait_lock() will report if the lock changes underneath.
323
This is the stages we want to happen:
325
0) Synchronization locks are created and locked.
326
1) Lock1 obtains the lockdir, and releases the 'check' lock.
327
2) Lock2 grabs the 'check' lock, and checks the lockdir.
328
It sees the lockdir is already acquired, reports the fact,
329
and unsets the 'checked' lock.
330
3) Thread1 blocks on acquiring the 'checked' lock, and then tells
331
Lock1 to release and acquire the lockdir. This resets the 'check'
333
4) Lock2 acquires the 'check' lock, and checks again. It notices
334
that the holder of the lock has changed, and so reports a new
336
5) Thread1 blocks on the 'checked' lock, this time, it completely
337
unlocks the lockdir, allowing Lock2 to acquire the lock.
340
raise tests.KnownFailure(
341
"timing dependency in lock tests (#213182)")
343
wait_to_check_lock = Lock()
344
wait_until_checked_lock = Lock()
346
wait_to_check_lock.acquire()
347
wait_until_checked_lock.acquire()
348
note('locked check and checked locks')
350
class LockDir1(LockDir):
351
"""Use the synchronization points for the first lock."""
353
def attempt_lock(self):
354
# Once we have acquired the lock, it is okay for
355
# the other lock to check it
357
return super(LockDir1, self).attempt_lock()
359
note('lock1: releasing check lock')
360
wait_to_check_lock.release()
362
class LockDir2(LockDir):
363
"""Use the synchronization points for the second lock."""
365
def attempt_lock(self):
366
note('lock2: waiting for check lock')
367
wait_to_check_lock.acquire()
368
note('lock2: acquired check lock')
370
return super(LockDir2, self).attempt_lock()
372
note('lock2: releasing checked lock')
373
wait_until_checked_lock.release()
375
t = self.get_transport()
376
lf1 = LockDir1(t, 'test_lock')
379
lf2 = LockDir2(t, 'test_lock')
380
self.setup_log_reporter(lf2)
382
def wait_and_switch():
384
# Block until lock2 has had a chance to check
385
note('lock1: waiting 1 for checked lock')
386
wait_until_checked_lock.acquire()
387
note('lock1: acquired for checked lock')
388
note('lock1: released lockdir')
390
note('lock1: acquiring lockdir')
391
# Create a new nonce, so the lock looks different.
392
lf1.nonce = osutils.rand_chars(20)
394
note('lock1: acquired lockdir')
396
# Block until lock2 has peeked again
397
note('lock1: waiting 2 for checked lock')
398
wait_until_checked_lock.acquire()
399
note('lock1: acquired for checked lock')
400
# Now unlock, and let lock 2 grab the lock
402
wait_to_check_lock.release()
404
unlocker = Thread(target=wait_and_switch)
407
# Wait and play against the other thread
408
lf2.wait_lock(timeout=20.0, poll=0.01)
413
# There should be 2 reports, because the lock changed
414
lock_base = lf2.transport.abspath(lf2.path)
415
self.assertEqual(2, len(self._logged_reports))
416
lock_url = lf2.transport.abspath(lf2.path)
417
self.assertEqual('%s %s\n'
419
'Will continue to try until %s, unless '
421
'If you\'re sure that it\'s not being '
422
'modified, use bzr break-lock %s',
423
self._logged_reports[0][0])
424
args = self._logged_reports[0][1]
425
self.assertEqual('Unable to obtain', args[0])
426
self.assertEqual('lock %s' % (lock_base,), args[1])
427
self.assertStartsWith(args[2], 'held by ')
428
self.assertStartsWith(args[3], 'locked ')
429
self.assertEndsWith(args[3], ' ago')
430
self.assertContainsRe(args[4], r'\d\d:\d\d:\d\d')
432
self.assertEqual('%s %s\n'
434
'Will continue to try until %s, unless '
436
'If you\'re sure that it\'s not being '
437
'modified, use bzr break-lock %s',
438
self._logged_reports[1][0])
439
args = self._logged_reports[1][1]
440
self.assertEqual('Lock owner changed for', args[0])
441
self.assertEqual('lock %s' % (lock_base,), args[1])
442
self.assertStartsWith(args[2], 'held by ')
443
self.assertStartsWith(args[3], 'locked ')
444
self.assertEndsWith(args[3], ' ago')
445
self.assertContainsRe(args[4], r'\d\d:\d\d:\d\d')
239
447
def test_40_confirm_easy(self):
240
448
"""Confirm a lock that's already held"""
352
560
self.assertRaises(LockBroken, ld1.unlock)
354
562
bzrlib.ui.ui_factory = orig_factory
564
def test_create_missing_base_directory(self):
565
"""If LockDir.path doesn't exist, it can be created
567
Some people manually remove the entire lock/ directory trying
568
to unlock a stuck repository/branch/etc. Rather than failing
569
after that, just create the lock directory when needed.
571
t = self.get_transport()
572
lf1 = LockDir(t, 'test_lock')
575
self.failUnless(t.has('test_lock'))
578
self.failIf(t.has('test_lock'))
580
# This will create 'test_lock' if it needs to
582
self.failUnless(t.has('test_lock'))
583
self.failUnless(t.has('test_lock/held/info'))
586
self.failIf(t.has('test_lock/held/info'))
588
def test__format_lock_info(self):
589
ld1 = self.get_lock()
593
info_list = ld1._format_lock_info(ld1.peek())
596
self.assertEqual('lock %s' % (ld1.transport.abspath(ld1.path),),
598
self.assertContainsRe(info_list[1],
599
r'^held by .* on host .* \[process #\d*\]$')
600
self.assertContainsRe(info_list[2], r'locked \d+ seconds? ago$')
602
def test_lock_without_email(self):
603
global_config = config.GlobalConfig()
604
# Intentionally has no email address
605
global_config.set_user_option('email', 'User Identity')
606
ld1 = self.get_lock()
611
def test_lock_permission(self):
612
if not osutils.supports_posix_readonly():
613
raise tests.TestSkipped('Cannot induce a permission failure')
614
ld1 = self.get_lock()
615
lock_path = ld1.transport.local_abspath('test_lock')
617
osutils.make_readonly(lock_path)
618
self.assertRaises(errors.LockFailed, ld1.attempt_lock)
620
def test_lock_by_token(self):
621
ld1 = self.get_lock()
622
token = ld1.lock_write()
623
self.assertNotEqual(None, token)
624
ld2 = self.get_lock()
625
t2 = ld2.lock_write(token)
626
self.assertEqual(token, t2)
628
def test_lock_with_buggy_rename(self):
629
# test that lock acquisition handles servers which pretend they
630
# renamed correctly but that actually fail
631
t = transport.get_transport('brokenrename+' + self.get_url())
632
ld1 = LockDir(t, 'test_lock')
635
ld2 = LockDir(t, 'test_lock')
636
# we should fail to lock
637
e = self.assertRaises(errors.LockContention, ld2.attempt_lock)
638
# now the original caller should succeed in unlocking
640
# and there should be nothing left over
641
self.assertEquals([], t.list_dir('test_lock'))
643
def test_failed_lock_leaves_no_trash(self):
644
# if we fail to acquire the lock, we don't leave pending directories
645
# behind -- https://bugs.launchpad.net/bzr/+bug/109169
646
ld1 = self.get_lock()
647
ld2 = self.get_lock()
648
# should be nothing before we start
650
t = self.get_transport().clone('test_lock')
652
self.assertEquals(a, t.list_dir('.'))
654
# when held, that's all we see
657
# second guy should fail
658
self.assertRaises(errors.LockContention, ld2.attempt_lock)