Rev 4797: Merge the sprout-bzrdir fixes in http://bazaar.launchpad.net/~jameinel/bzr/2.1.0b4-win32-test-suite
John Arbash Meinel
john at arbash-meinel.com
Sun Nov 8 03:28:13 GMT 2009
At http://bazaar.launchpad.net/~jameinel/bzr/2.1.0b4-win32-test-suite
------------------------------------------------------------
revno: 4797 [merge]
revision-id: john at arbash-meinel.com-20091108032801-t3cvy8ny40321fin
parent: john at arbash-meinel.com-20091108031231-5q0xzgo7kn42sm2b
parent: john at arbash-meinel.com-20091108032529-lxhhn2zr29dln7u1
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: 2.1.0b4-win32-test-suite
timestamp: Sat 2009-11-07 21:28:01 -0600
message:
Merge the sprout-bzrdir fixes
modified:
bzrlib/tests/per_bzrdir/test_bzrdir.py test_bzrdir.py-20060131065642-0ebeca5e30e30866
-------------- next part --------------
=== modified file 'bzrlib/tests/per_bzrdir/test_bzrdir.py'
--- a/bzrlib/tests/per_bzrdir/test_bzrdir.py 2009-09-18 17:19:15 +0000
+++ b/bzrlib/tests/per_bzrdir/test_bzrdir.py 2009-11-08 03:25:29 +0000
@@ -778,13 +778,18 @@
'./.bzr/repository/inventory.knit',
])
try:
+ local_inventory = dir.transport.local_abspath('inventory')
+ except errors.NotLocalUrl:
+ return
+ try:
# If we happen to have a tree, we'll guarantee everything
# except for the tree root is the same.
- inventory_f = file(dir.transport.base+'inventory', 'rb')
- self.assertContainsRe(inventory_f.read(),
- '<inventory file_id="TREE_ROOT[^"]*"'
- ' format="5">\n</inventory>\n')
- inventory_f.close()
+ inventory_f = file(local_inventory, 'rb')
+ try:
+ self.assertContainsRe(inventory_f.read(),
+ '<inventory format="5">\n</inventory>\n')
+ finally:
+ inventory_f.close()
except IOError, e:
if e.errno != errno.ENOENT:
raise
More information about the bazaar-commits
mailing list