Rev 5094: (mbp) improve release process documentation in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

At file:///home/pqm/archives/thelove/bzr/%2Btrunk/

------------------------------------------------------------
revno: 5094 [merge]
revision-id: pqm at pqm.ubuntu.com-20100318011517-fx3cmbtk9p0bdlp8
parent: pqm at pqm.ubuntu.com-20100317235716-vws90s2mun3mn8lc
parent: mbp at canonical.com-20100317025808-d9cf9lu1fpsttp2b
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2010-03-18 01:15:17 +0000
message:
  (mbp) improve release process documentation
modified:
  doc/developers/releasing.txt   releasing.txt-20080502015919-fnrcav8fwy8ccibu-1
  doc/developers/testing.txt     testing.txt-20080812140359-i70zzh6v2z7grqex-1
=== modified file 'doc/developers/releasing.txt'
--- a/doc/developers/releasing.txt	2009-12-02 20:34:07 +0000
+++ b/doc/developers/releasing.txt	2010-03-17 02:58:08 +0000
@@ -55,6 +55,10 @@
    ``bzrlib/__init__.py`` file. Make sure there is always a corresponding
    milestone when you change that version number.
 
+#. Add a new section at the top of ``NEWS`` about the new release,
+   including its version number and the headings from
+   ``NEWS-template.txt``.
+
 #. Send mail to the list with the key dates, who will be the release
    manager, and the main themes or targeted bugs.  Ask people to nominate
    objectives, or point out any high-risk things that are best done early,

=== modified file 'doc/developers/testing.txt'
--- a/doc/developers/testing.txt	2010-02-28 10:08:29 +0000
+++ b/doc/developers/testing.txt	2010-03-09 01:15:37 +0000
@@ -455,6 +455,29 @@
   unless there is a good reason
 
 
+Testing locking behaviour
+-------------------------
+
+You may want to write tests that particular objects are or aren't locked
+during particular operations: see for example `bug 498409`__.  
+
+ __ https://launchpad.net/bugs/498409
+
+The `TestCase` base class registers hooks that record lock actions into 
+``._lock_actions`` in this format::
+
+  [
+    ('acquired', LockResult(file:///tmp/testbzr-J2pcy2.tmp/.bzr/branch-lockc4au55ppz8wdym11z1aq)),
+    ('released', LockResult(file:///tmp/testbzr-J2pcy2.tmp/.bzr/branch-lockc4au55ppz8wdym11z1aq)),
+    ('acquired', LockResult(file:///tmp/testbzr-J2pcy2.tmp/.bzr/repository/lockyxb3rn4sw1oyx1jzkt45)),
+    ('released', LockResult(file:///tmp/testbzr-J2pcy2.tmp/.bzr/repository/lockyxb3rn4sw1oyx1jzkt45)),
+    ('acquired', LockResult(file:///tmp/testbzr-J2pcy2.tmp/.bzr/branch/lockh8c6t28rcjdkgxtndbje)),
+    ('released', LockResult(file:///tmp/testbzr-J2pcy2.tmp/.bzr/branch/lockh8c6t28rcjdkgxtndbje)),
+    ...
+
+Alternatively you can register your own hooks to make custom assertions:
+see `TestCase._check_locks` for an example.
+
 Skipping tests
 --------------