← 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: v.ladeuil+lp at free
  • Date: 2007-05-18 18:20:31 UTC
  • mto: (2485.8.44 bzr.connection.sharing)
  • mto: This revision was merged to the branch mainline in revision 2646.
  • Revision ID: v.ladeuil+lp@free.fr-20070518182031-gbg2cgidv5l20x9p
Takes Robert comments into account.

* bzrlib/transport/ftp.py:
(FtpTransport.__init__): Write a better explanation.

* bzrlib/tests/test_init.py:
(InstrumentedTransport): Just make hooks a class attribute.
(InstrumentedTransport._get_FTP): Run hook directly in the for
loop.
(TransportHooks.run_hook, TransportHooks.uninstall_hook): Not
needed. The hooks should be cleaned up by the test itself.
(TestInit.setUp.cleanup): Resset to default hooks.

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_mpdiffs(self):
251
 
        from bzrlib import multiparent
252
 
        vf = self.get_file('foo')
253
 
        sha1s = self._setup_for_deltas(vf)
254
 
        new_vf = self.get_file('bar')
255
 
        for version in multiparent.topo_iter(vf):
256
 
            mpdiff = vf.make_mpdiffs([version])[0]
257
 
            new_vf.add_mpdiffs([(version, vf.get_parents(version),
258
 
                                 vf.get_sha1(version), mpdiff)])
259
 
            self.assertEqualDiff(vf.get_text(version),
260
 
                                 new_vf.get_text(version))
261
 
 
262
250
    def _setup_for_deltas(self, f):
263
251
        self.assertRaises(errors.RevisionNotPresent, f.get_delta, 'base')
264
252
        # add texts that should trip the knit maximum delta chain threshold
396
384
        self.assertRaises(RevisionNotPresent,
397
385
            f.get_ancestry, ['rM', 'rX'])
398
386
 
399
 
        self.assertEqual(set(f.get_ancestry('rM')),
400
 
            set(f.get_ancestry('rM', topo_sorted=False)))
401
 
 
402
387
    def test_mutate_after_finish(self):
403
388
        f = self.get_file()
404
389
        f.transaction_finished()
788
773
            '3f786850e387550fdab836ed7e6dc881de23001b', vf.get_sha1('b'))
789
774
        self.assertEqual(
790
775
            '86f7e437faa5a7fce15d1ddcb9eaeaea377667b8', vf.get_sha1('c'))
791
 
 
792
 
        self.assertEqual(['3f786850e387550fdab836ed7e6dc881de23001b',
793
 
                          '86f7e437faa5a7fce15d1ddcb9eaeaea377667b8',
794
 
                          '3f786850e387550fdab836ed7e6dc881de23001b'],
795
 
                          vf.get_sha1s(['a', 'c', 'b']))
796
776
        
797
777
 
798
778
class TestWeave(TestCaseWithTransport, VersionedFileTestMixIn):