Rev 2050: (jam) tests that expect LockContention should timeout sooner in /home/pqm/archives/thelove/bzr/+trunk/
Canonical.com Patch Queue Manager
pqm at pqm.ubuntu.com
Thu Sep 28 09:13:59 BST 2006
------------------------------------------------------------
revno: 2050
revision-id: pqm at pqm.ubuntu.com-20060928081358-b8dfad24b0625b94
parent: pqm at pqm.ubuntu.com-20060927204431-5871ab3ef6affaf3
parent: john at arbash-meinel.com-20060927221253-db89ca8e8a8c102e
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2006-09-28 09:13:58 +0100
message:
(jam) tests that expect LockContention should timeout sooner
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/lockdir.py lockdir.py-20060220222025-98258adf27fbdda3
bzrlib/osutils.py osutils.py-20050309040759-eeaff12fbf77ac86
bzrlib/tests/blackbox/test_break_lock.py test_break_lock.py-20060303014503-a90e07d38d042d1d
bzrlib/tests/bzrdir_implementations/test_bzrdir.py test_bzrdir.py-20060131065642-0ebeca5e30e30866
bzrlib/tests/test_commit.py test_commit.py-20050914060732-279f057f8c295434
bzrlib/tests/test_lockdir.py test_lockdir.py-20060220222025-33d4221569a3d600
bzrlib/tests/test_osutils.py test_osutils.py-20051201224856-e48ee24c12182989
bzrlib/tests/workingtree_implementations/test_locking.py test_locking.py-20060707151933-tav3o2hpibwi53u4-3
------------------------------------------------------------
merged: john at arbash-meinel.com-20060927221253-db89ca8e8a8c102e
parent: john at arbash-meinel.com-20060927205837-63bc5063fe9a2ebf
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: wait-on-lock
timestamp: Wed 2006-09-27 17:12:53 -0500
message:
Change tests that expect locking to fail to timeout sooner.
This includes changing LockDir to not have a compiled-in default timeout.
------------------------------------------------------------
merged: john at arbash-meinel.com-20060927205837-63bc5063fe9a2ebf
parent: john at arbash-meinel.com-20060927205222-2f2a5d351b52b617
parent: pqm at pqm.ubuntu.com-20060927204431-5871ab3ef6affaf3
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: wait-on-lock
timestamp: Wed 2006-09-27 15:58:37 -0500
message:
[merge] bzr.dev 2049
------------------------------------------------------------
merged: john at arbash-meinel.com-20060927205222-2f2a5d351b52b617
parent: john at arbash-meinel.com-20060925204824-f4fff4858fa59b0c
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: wait-on-lock
timestamp: Wed 2006-09-27 15:52:22 -0500
message:
Review feedback from Robert
------------------------------------------------------------
merged: john at arbash-meinel.com-20060925204824-f4fff4858fa59b0c
parent: john at arbash-meinel.com-20060922233640-d9921804c4f151ff
parent: pqm at pqm.ubuntu.com-20060925194052-a685edd457d83f8e
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: wait-on-lock
timestamp: Mon 2006-09-25 15:48:24 -0500
message:
[merge] bzr.dev 2041
------------------------------------------------------------
merged: john at arbash-meinel.com-20060922233640-d9921804c4f151ff
parent: john at arbash-meinel.com-20060920180700-0195b84c614cd094
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: wait-on-lock
timestamp: Fri 2006-09-22 18:36:40 -0500
message:
Change to reporting the time when we will stop trying to grab the lock
------------------------------------------------------------
merged: john at arbash-meinel.com-20060920180700-0195b84c614cd094
parent: john at arbash-meinel.com-20060920175228-b0ebfba4c3384f9d
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: wait-on-lock
timestamp: Wed 2006-09-20 13:07:00 -0500
message:
Update NEWS for fixing bugs #43521, #49556
------------------------------------------------------------
merged: john at arbash-meinel.com-20060920175228-b0ebfba4c3384f9d
parent: john at arbash-meinel.com-20060920171045-b6370b896a35fe9d
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: wait-on-lock
timestamp: Wed 2006-09-20 12:52:28 -0500
message:
Switch from locking the peek() to locking attempt_lock(), which is much more stable
------------------------------------------------------------
merged: john at arbash-meinel.com-20060920171045-b6370b896a35fe9d
parent: john at arbash-meinel.com-20060920170114-20251f6bb2e7b7f7
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: wait-on-lock
timestamp: Wed 2006-09-20 12:10:45 -0500
message:
NEWS
------------------------------------------------------------
merged: john at arbash-meinel.com-20060920170114-20251f6bb2e7b7f7
parent: john at arbash-meinel.com-20060920163319-be9550fb82b83385
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: wait-on-lock
timestamp: Wed 2006-09-20 12:01:14 -0500
message:
Change default timeouts, and report differently the first failure
------------------------------------------------------------
merged: john at arbash-meinel.com-20060920163319-be9550fb82b83385
parent: john at arbash-meinel.com-20060920163206-f996c191184dd0f7
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: wait-on-lock
timestamp: Wed 2006-09-20 11:33:19 -0500
message:
Decrease the waiting time
------------------------------------------------------------
merged: john at arbash-meinel.com-20060920163206-f996c191184dd0f7
parent: john at arbash-meinel.com-20060915004457-902cec0526a39337
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: wait-on-lock
timestamp: Wed 2006-09-20 11:32:06 -0500
message:
Add the ability to report if the lock changes from underneath you
------------------------------------------------------------
merged: john at arbash-meinel.com-20060915004457-902cec0526a39337
parent: john at arbash-meinel.com-20060915004210-7f52628492d8b01c
parent: pqm at pqm.ubuntu.com-20060914085936-0fb09526ebcf67d2
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: wait-on-lock
timestamp: Thu 2006-09-14 19:44:57 -0500
message:
[merge] bzr.dev 2009
------------------------------------------------------------
merged: john at arbash-meinel.com-20060915004210-7f52628492d8b01c
parent: john at arbash-meinel.com-20060915003147-b8b8c95f788ec272
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: wait-on-lock
timestamp: Thu 2006-09-14 19:42:10 -0500
message:
Create a helper function for formatting lock information
------------------------------------------------------------
merged: john at arbash-meinel.com-20060915003147-b8b8c95f788ec272
parent: john at arbash-meinel.com-20060825212605-a89d9eef25df6972
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: wait-on-lock
timestamp: Thu 2006-09-14 19:31:47 -0500
message:
create a helper for formatting a time delta
------------------------------------------------------------
merged: john at arbash-meinel.com-20060825212605-a89d9eef25df6972
parent: john at arbash-meinel.com-20060825205133-402530a133d623a0
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: wait-on-lock
timestamp: Fri 2006-08-25 16:26:05 -0500
message:
NEWS: this addresses bug #49556
------------------------------------------------------------
merged: john at arbash-meinel.com-20060825205133-402530a133d623a0
parent: john at arbash-meinel.com-20060825204048-677cae3cf5ff9ead
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: wait-on-lock
timestamp: Fri 2006-08-25 15:51:33 -0500
message:
Switch the default from instantly aborting, to waiting as long as 1 minute (down from 5 minutes)
------------------------------------------------------------
merged: john at arbash-meinel.com-20060825204048-677cae3cf5ff9ead
parent: pqm at pqm.ubuntu.com-20060825162024-eda7457881a28da7
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: wait-on-lock
timestamp: Fri 2006-08-25 15:40:48 -0500
message:
Report to the user when we are spinning on a lock
More information about the bazaar-commits
mailing list