← 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: Canonical.com Patch Queue Manager
  • Date: 2007-03-14 15:50:44 UTC
  • mfrom: (1551.12.58 mergedirective-fixes)
  • Revision ID: pqm@pqm.ubuntu.com-20070314155044-47c0c6257a6c6717
Fixes for merge directives

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_merge_directive.py
131
131
            patch='booga', patch_type='diff')
132
132
        md2 = merge_directive.MergeDirective.from_lines(md.to_lines())
133
133
        self.assertEqual('example:', md2.revision_id)
 
134
        self.assertIsInstance(md2.revision_id, str)
134
135
        self.assertEqual('sha', md2.testament_sha1)
135
136
        self.assertEqual('http://example.com', md2.target_branch)
136
137
        self.assertEqual('http://example.org', md2.source_branch)
147
148
        self.assertContainsRe(md3.to_lines()[0],
148
149
            '^# Bazaar merge directive format ')
149
150
        self.assertEqual("Hi mom!", md3.message)
 
151
        md3.patch_type = None
 
152
        md3.patch = None
 
153
        md4 = merge_directive.MergeDirective.from_lines(md3.to_lines())
 
154
        self.assertIs(None, md4.patch_type)
150
155
 
151
156
 
152
157
EMAIL1 = """To: pqm@example.com