← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_merge_directive.py

  • Committer: Aaron Bentley
  • Date: 2007-03-11 00:47:07 UTC
  • mto: (2323.6.9 0.15-integration)
  • mto: This revision was merged to the branch mainline in revision 2342.
  • Revision ID: aaron.bentley@utoronto.ca-20070311004707-nvgm18l7xx9md7hg
Proper error when deserializing junk

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_merge_directive.py
85
85
            patch='booga', patch_type='diff', message="Hi mom!")
86
86
        self.assertEqualDiff(OUTPUT2, ''.join(md.to_lines()))
87
87
 
 
88
    def test_deserialize_junk(self):
 
89
        self.assertRaises(errors.NotAMergeDirective,
 
90
                          merge_directive.MergeDirective.from_lines, 'lala')
 
91
 
 
92
 
88
93
    def test_roundtrip(self):
89
94
        time = 501
90
95
        timezone = 72