Rev 3457: Skip the new test for old weave formats that don't support ghosts in http://bzr.arbash-meinel.com/branches/bzr/1.6-dev/mpdiffs_235687

John Arbash Meinel john at arbash-meinel.com
Mon Jun 9 21:49:00 BST 2008


At http://bzr.arbash-meinel.com/branches/bzr/1.6-dev/mpdiffs_235687

------------------------------------------------------------
revno: 3457
revision-id: john at arbash-meinel.com-20080609204820-llja7xdsn90zmgza
parent: john at arbash-meinel.com-20080529144133-ilzj3ezed8469x6d
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: mpdiffs_235687
timestamp: Mon 2008-06-09 15:48:20 -0500
message:
  Skip the new test for old weave formats that don't support ghosts
-------------- next part --------------
=== modified file 'bzrlib/tests/test_versionedfile.py'
--- a/bzrlib/tests/test_versionedfile.py	2008-05-29 14:40:07 +0000
+++ b/bzrlib/tests/test_versionedfile.py	2008-06-09 20:48:20 +0000
@@ -544,7 +544,11 @@
 
     def test_make_mpdiffs_with_ghosts(self):
         vf = self.get_file('foo')
-        vf.add_lines_with_ghosts('text', ['ghost'], ['line\n'])
+        try:
+            vf.add_lines_with_ghosts('text', ['ghost'], ['line\n'])
+        except NotImplementedError:
+            # old Weave formats do not allow ghosts
+            return
         self.assertRaises(errors.RevisionNotPresent, vf.make_mpdiffs, ['ghost'])
 
     def _setup_for_deltas(self, f):



More information about the bazaar-commits mailing list