Rev 3623: Review feedback. in http://people.ubuntu.com/~robertc/baz2.0/integration

Robert Collins robertc at robertcollins.net
Thu Aug 14 07:54:39 BST 2008


At http://people.ubuntu.com/~robertc/baz2.0/integration

------------------------------------------------------------
revno: 3623
revision-id: robertc at robertcollins.net-20080814065435-73xgy9r6xtqmvzux
parent: robertc at robertcollins.net-20080814064629-wuzmbxzw7tn27usi
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Thu 2008-08-14 16:54:35 +1000
message:
  Review feedback.
modified:
  bzrlib/tests/intertree_implementations/test_compare.py test_compare.py-20060724101752-09ysswo1a92uqyoz-2
=== modified file 'bzrlib/tests/intertree_implementations/test_compare.py'
--- a/bzrlib/tests/intertree_implementations/test_compare.py	2008-08-13 03:21:19 +0000
+++ b/bzrlib/tests/intertree_implementations/test_compare.py	2008-08-14 06:54:35 +0000
@@ -21,6 +21,7 @@
 
 from bzrlib import errors, tests, workingtree_4
 from bzrlib.osutils import file_kind, has_symlinks
+from bzrlib.tests import TestNotApplicable
 from bzrlib.tests.intertree_implementations import TestCaseWithTwoTrees
 
 # TODO: test the include_root option.
@@ -709,7 +710,7 @@
             # file status. This is normal (e.g. InterDirstateTree falls back
             # to InterTree if the basis is not a DirstateRevisionTree, and
             # revision trees cannot have missing files. 
-            return
+            raise TestNotApplicable()
         expected = [('file-id', ('file', None), False, (True, False),
             (root_id, None), ('file', None), (None, None), (False, None))]
         self.assertEqual(expected, self.do_iter_changes(tree1, tree2))




More information about the bazaar-commits mailing list