[MERGE] Lock correctness for test_upgrade.py.

[Robert Collins]

This fixes test_upgrade to lock things appropriately.

-Rob
-- 
GPG key available at: <http://www.robertcollins.net/keys.txt>.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: bzr-mail-Twbzur.patch
Type: text/x-patch
Size: 23128 bytes
Desc: not available
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20071127/6314e619/attachment-0001.bin 
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: This is a digitally signed message part
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20071127/6314e619/attachment-0001.pgp