Rev 4674: Review feedback. in http://bazaar.launchpad.net/~lifeless/bzr/2.0

[Robert Collins]

At http://bazaar.launchpad.net/~lifeless/bzr/2.0

------------------------------------------------------------
revno: 4674
revision-id: robertc at robertcollins.net-20090930222254-89urarrj0diujtxr
parent: robertc at robertcollins.net-20090930055845-rlgsvwo6oz2pu7ln
committer: Robert Collins <robertc at robertcollins.net>
branch nick: 2.0
timestamp: Thu 2009-10-01 08:22:54 +1000
message:
  Review feedback.
=== modified file 'bzrlib/tests/per_intertree/test_compare.py'
--- a/bzrlib/tests/per_intertree/test_compare.py	2009-09-30 05:58:45 +0000
+++ b/bzrlib/tests/per_intertree/test_compare.py	2009-09-30 22:22:54 +0000
@@ -978,9 +978,8 @@
                 "Cannot represent a FIFO in this case %s" % self.id())
         try:
             self.do_iter_changes(tree1, tree2)
-        except errors.BzrError:
-            self.assertRaises(errors.BadFileKindError, self.do_iter_changes,
-                tree1, tree2)
+        except errors.BadFileKindError:
+            pass
 
     def test_missing_in_target(self):
         """Test with the target files versioned but absent from disk."""