/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_merge_directive.py

  • Committer: Robert Collins
  • Date: 2007-08-22 00:00:26 UTC
  • mfrom: (2739 +trunk)
  • mto: (2592.3.96 repository)
  • mto: This revision was merged to the branch mainline in revision 2742.
  • Revision ID: robertc@robertcollins.net-20070822000026-kvufiqhlreokb1en
Merge bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_merge_directive.py
31
31
#\x20
32
32
booga"""
33
33
 
34
 
OUTPUT1_2 = """# Bazaar merge directive format 2 (Bazaar 0.19)
 
34
OUTPUT1_2 = """# Bazaar merge directive format 2 (Bazaar 0.90)
35
35
# revision_id: example:
36
36
# target_branch: http://example.com
37
37
# testament_sha1: sha
51
51
#\x20
52
52
booga"""
53
53
 
54
 
OUTPUT2_2 = """# Bazaar merge directive format 2 (Bazaar 0.19)
 
54
OUTPUT2_2 = """# Bazaar merge directive format 2 (Bazaar 0.90)
55
55
# revision_id: example:
56
56
# target_branch: http://example.com
57
57
# testament_sha1: sha
96
96
 
97
97
Aaron
98
98
 
 
99
# Bazaar merge directive format 2 (Bazaar 0.90)\r
 
100
# revision_id: example:
 
101
# target_branch: http://example.com
 
102
# testament_sha1: sha
 
103
# timestamp: 1970-01-01 00:09:33 +0002
 
104
# source_branch: http://example.org
 
105
# base_revision_id: null:
 
106
# message: Hi mom!
 
107
#\x20
 
108
# Begin patch
 
109
booga""".splitlines(True)
 
110
 
 
111
 
 
112
INPUT1_2_OLD = """
 
113
I was thinking today about creating a merge directive.
 
114
 
 
115
So I did.
 
116
 
 
117
Here it is.
 
118
 
 
119
(I've pasted it in the body of this message)
 
120
 
 
121
Aaron
 
122
 
99
123
# Bazaar merge directive format 2 (Bazaar 0.19)\r
100
124
# revision_id: example:
101
125
# target_branch: http://example.com
109
133
booga""".splitlines(True)
110
134
 
111
135
 
 
136
OLD_DIRECTIVE_2 = """# Bazaar merge directive format 2 (Bazaar 0.19)
 
137
# revision_id: abentley@panoramicfeedback.com-20070807234458-\
 
138
#   nzhkoyza56lan7z5
 
139
# target_branch: http://panoramicfeedback.com/opensource/bzr/repo\
 
140
#   /bzr.ab
 
141
# testament_sha1: d825a5cdb267a90ec2ba86b00895f3d8a9bed6bf
 
142
# timestamp: 2007-08-10 16:15:02 -0400
 
143
# source_branch: http://panoramicfeedback.com/opensource/bzr/repo\
 
144
#   /bzr.ab
 
145
# base_revision_id: abentley@panoramicfeedback.com-20070731163346-\
 
146
#   623xwcycwij91xen
 
147
#
 
148
""".splitlines(True)
 
149
 
 
150
 
112
151
class TestMergeDirective(object):
113
152
 
114
153
    def test_merge_source(self):
270
309
To: pqm@example.com
271
310
User-Agent: Bazaar \(.*\)
272
311
 
273
 
# Bazaar merge directive format 2 \\(Bazaar 0.19\\)
 
312
# Bazaar merge directive format 2 \\(Bazaar 0.90\\)
274
313
# revision_id: rev2a
275
314
# target_branch: (.|\n)*
276
315
# testament_sha1: .*
298
337
To: pqm@example.com
299
338
User-Agent: Bazaar \(.*\)
300
339
 
301
 
# Bazaar merge directive format 2 \\(Bazaar 0.19\\)
 
340
# Bazaar merge directive format 2 \\(Bazaar 0.90\\)
302
341
# revision_id: rev2a
303
342
# target_branch: (.|\n)*
304
343
# testament_sha1: .*
489
528
            self.assertEqual('inapplicable', verified)
490
529
        else:
491
530
            self.assertEqual('rev1', base)
492
 
            self.assertEqual('failed', verified)
 
531
            self.expectFailure('Patch verification is disabled',
 
532
                               self.assertEqual, 'failed', verified)
493
533
 
494
534
    def test_install_revisions_bundle(self):
495
535
        tree_a, tree_b, branch_c = self.make_trees()
599
639
        self.assertTrue(md2._verify_patch(tree_a.branch.repository))
600
640
        md2.patch = md2.patch.replace('content_c', 'content_d')
601
641
        self.assertFalse(md2._verify_patch(tree_a.branch.repository))
 
642
 
 
643
 
 
644
class TestParseOldMergeDirective2(tests.TestCase):
 
645
 
 
646
    def test_parse_old_merge_directive(self):
 
647
        md = merge_directive.MergeDirective.from_lines(INPUT1_2_OLD)
 
648
        self.assertEqual('example:', md.revision_id)
 
649
        self.assertEqual('sha', md.testament_sha1)
 
650
        self.assertEqual('http://example.com', md.target_branch)
 
651
        self.assertEqual('http://example.org', md.source_branch)
 
652
        self.assertEqual(453, md.time)
 
653
        self.assertEqual(120, md.timezone)
 
654
        self.assertEqual('booga', md.patch)
 
655
        self.assertEqual('diff', md.patch_type)
 
656
        self.assertEqual('Hi mom!', md.message)