At http://bazaar.launchpad.net/%7Ebzr/bzr/osx_tests_fix
------------------------------------------------------------
revno: 3655
revision-id: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Vincent Ladeuil <[EMAIL PROTECTED]>
branch nick: osx_tests_fix
timestamp: Thu 2008-09-11 10:56:59 +0200
message:
Fixed as per Aaron's review.
* bzrlib/tests/test_transform.py:
(TestTreeTransform.test_rollback_on_directory_clash.tt_helper):
Cleanup and grammar fixes.
modified:
bzrlib/tests/test_transform.py
test_transaction.py-20060105172520-b3ffb3946550e6c4
=== modified file 'bzrlib/tests/test_transform.py'
--- a/bzrlib/tests/test_transform.py 2008-09-08 14:50:15 +0000
+++ b/bzrlib/tests/test_transform.py 2008-09-11 08:56:59 +0000
@@ -1163,9 +1163,8 @@
transform.finalize()
def test_rollback_on_directory_clash(self):
- wt = self.make_branch_and_tree('.')
- wt.add
def tt_helper():
+ wt = self.make_branch_and_tree('.')
tt = TreeTransform(wt) # TreeTransform obtains write lock
try:
foo = tt.new_directory('foo', tt.root)
@@ -1179,8 +1178,8 @@
except:
wt.unlock()
raise
- # It will fail the renaming because the target directory is not empty
- # (but raise FileExists anyway).
+ # The rename will fail because the target directory is not empty (but
+ # raises FileExists anyway).
err = self.assertRaises(errors.FileExists, tt_helper)
self.assertContainsRe(str(err),
"^File exists: .+/baz")
--
bazaar-commits mailing list
[email protected]
https://lists.ubuntu.com/mailman/listinfo/bazaar-commits
