← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_versionedfile.py

  • Committer: Aaron Bentley
  • Date: 2007-06-22 21:53:56 UTC
  • mto: (2520.5.2 bzr.mpbundle)
  • mto: This revision was merged to the branch mainline in revision 2631.
  • Revision ID: abentley@panoramicfeedback.com-20070622215356-v2gdv5xzy8gzdsju
Get all test passing (which just proves there aren't enough tests!)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_versionedfile.py
247
247
        self.assertEqual(['line'], f.get_lines('eolbeforefirstparent'))
248
248
        #self.assertTrue(deltas['eolbeforefirstparent'] in expected_deltas)
249
249
 
250
 
    def test_make_mpdiff(self):
 
250
    def test_make_mpdiffs(self):
251
251
        from bzrlib import multiparent
252
252
        vf = self.get_file('foo')
253
253
        sha1s = self._setup_for_deltas(vf)
254
254
        new_vf = self.get_file('bar')
255
255
        for version in multiparent.topo_iter(vf):
256
 
            mpdiff = vf.make_mpdiff(version)
257
 
            new_vf.add_mpdiff(version, vf.get_parents(version), mpdiff)
 
256
            mpdiff = vf.make_mpdiffs([version])[0]
 
257
            new_vf.add_mpdiffs([(version, vf.get_parents(version),
 
258
                                 vf.get_sha1(version), mpdiff)])
258
259
            self.assertEqualDiff(vf.get_text(version),
259
260
                                 new_vf.get_text(version))
260
261