← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_weave.py

  • Committer: Jelmer Vernooij
  • Date: 2011-01-19 20:09:12 UTC
  • mto: (5582.10.33 weave-fmt-plugin)
  • mto: This revision was merged to the branch mainline in revision 5625.
  • Revision ID: jelmer@samba.org-20110119200912-dm3hbp7dxqg7isbp
remove some of the weave changes.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_weave.py
696
696
        w = read_weave(tmpf)
697
697
 
698
698
        self.assertEqual('hello\n', w.get_text('v1'))
699
 
        self.assertRaises(errors.VersionedFileInvalidChecksum, w.get_text, 'v2')
700
 
        self.assertRaises(errors.VersionedFileInvalidChecksum, w.get_lines, 'v2')
701
 
        self.assertRaises(errors.VersionedFileInvalidChecksum, w.check)
 
699
        self.assertRaises(errors.WeaveInvalidChecksum, w.get_text, 'v2')
 
700
        self.assertRaises(errors.WeaveInvalidChecksum, w.get_lines, 'v2')
 
701
        self.assertRaises(errors.WeaveInvalidChecksum, w.check)
702
702
 
703
703
        # Change the sha checksum
704
704
        tmpf = StringIO('# bzr weave file v5\n'
709
709
        w = read_weave(tmpf)
710
710
 
711
711
        self.assertEqual('hello\n', w.get_text('v1'))
712
 
        self.assertRaises(errors.VersionedFileInvalidChecksum, w.get_text, 'v2')
713
 
        self.assertRaises(errors.VersionedFileInvalidChecksum, w.get_lines, 'v2')
714
 
        self.assertRaises(errors.VersionedFileInvalidChecksum, w.check)
 
712
        self.assertRaises(errors.WeaveInvalidChecksum, w.get_text, 'v2')
 
713
        self.assertRaises(errors.WeaveInvalidChecksum, w.get_lines, 'v2')
 
714
        self.assertRaises(errors.WeaveInvalidChecksum, w.check)
715
715
 
716
716
 
717
717
class TestWeave(TestCase):
764
764
    def test_empty_file(self):
765
765
        f = open('empty.weave', 'wb+')
766
766
        try:
767
 
            self.assertRaises(WeaveFormatError, read_weave, f)
 
767
            self.assertRaises(errors.WeaveFormatError,
 
768
                              read_weave, f)
768
769
        finally:
769
770
            f.close()