/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: 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
 
1
# Copyright (C) 2007 Canonical Ltd
 
2
#
 
3
# This program is free software; you can redistribute it and/or modify
 
4
# it under the terms of the GNU General Public License as published by
 
5
# the Free Software Foundation; either version 2 of the License, or
 
6
# (at your option) any later version.
 
7
#
 
8
# This program is distributed in the hope that it will be useful,
 
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
 
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 
11
# GNU General Public License for more details.
 
12
#
 
13
# You should have received a copy of the GNU General Public License
 
14
# along with this program; if not, write to the Free Software
 
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
16
 
 
17
 
 
18
from bzrlib import (
 
19
    errors,
 
20
    gpg,
 
21
    merge_directive,
 
22
    tests,
 
23
    )
 
24
 
 
25
 
 
26
OUTPUT1 = """# Bazaar merge directive format 1
 
27
# revision_id: example:
 
28
# target_branch: http://example.com
 
29
# testament_sha1: sha
 
30
# timestamp: 1970-01-01 00:09:33 +0002
 
31
#\x20
 
32
booga"""
 
33
 
 
34
 
 
35
OUTPUT2 = """# Bazaar merge directive format 1
 
36
# revision_id: example:
 
37
# target_branch: http://example.com
 
38
# testament_sha1: sha
 
39
# timestamp: 1970-01-01 00:09:33 +0002
 
40
# source_branch: http://example.org
 
41
# message: Hi mom!
 
42
#\x20
 
43
booga"""
 
44
 
 
45
 
 
46
class TestMergeDirective(tests.TestCase):
 
47
 
 
48
    def test_merge_source(self):
 
49
        time = 500.0
 
50
        timezone = 5
 
51
        self.assertRaises(errors.NoMergeSource, merge_directive.MergeDirective,
 
52
            'example:', 'sha', time, timezone, 'http://example.com')
 
53
        self.assertRaises(errors.NoMergeSource, merge_directive.MergeDirective,
 
54
            'example:', 'sha', time, timezone, 'http://example.com',
 
55
            patch_type='diff')
 
56
        merge_directive.MergeDirective('example:', 'sha', time, timezone,
 
57
            'http://example.com', source_branch='http://example.org')
 
58
        md = merge_directive.MergeDirective('null:', 'sha', time, timezone,
 
59
            'http://example.com', patch='blah', patch_type='bundle')
 
60
        self.assertIs(None, md.source_branch)
 
61
        md2 = merge_directive.MergeDirective('null:', 'sha', time, timezone,
 
62
            'http://example.com', patch='blah', patch_type='bundle',
 
63
            source_branch='bar')
 
64
        self.assertEqual('bar', md2.source_branch)
 
65
 
 
66
    def test_require_patch(self):
 
67
        time = 500.0
 
68
        timezone = 5
 
69
        self.assertRaises(errors.PatchMissing, merge_directive.MergeDirective,
 
70
            'example:', 'sha', time, timezone, 'http://example.com',
 
71
            patch_type='bundle')
 
72
        md = merge_directive.MergeDirective('example:', 'sha1', time, timezone,
 
73
            'http://example.com', source_branch="http://example.org",
 
74
            patch='', patch_type='diff')
 
75
        self.assertEqual(md.patch, '')
 
76
 
 
77
    def test_serialization(self):
 
78
        time = 501
 
79
        timezone = 72
 
80
        md = merge_directive.MergeDirective('example:', 'sha', time, timezone,
 
81
            'http://example.com', patch='booga', patch_type='bundle')
 
82
        self.assertEqualDiff(OUTPUT1, ''.join(md.to_lines()))
 
83
        md = merge_directive.MergeDirective('example:', 'sha', time, timezone,
 
84
            'http://example.com', source_branch="http://example.org",
 
85
            patch='booga', patch_type='diff', message="Hi mom!")
 
86
        self.assertEqualDiff(OUTPUT2, ''.join(md.to_lines()))
 
87
 
 
88
    def test_deserialize_junk(self):
 
89
        self.assertRaises(errors.NotAMergeDirective,
 
90
                          merge_directive.MergeDirective.from_lines, 'lala')
 
91
 
 
92
 
 
93
    def test_roundtrip(self):
 
94
        time = 501
 
95
        timezone = 72
 
96
        md = merge_directive.MergeDirective('example:', 'sha', time, timezone,
 
97
            'http://example.com', source_branch="http://example.org",
 
98
            patch='booga', patch_type='diff')
 
99
        md2 = merge_directive.MergeDirective.from_lines(md.to_lines())
 
100
        self.assertEqual('example:', md2.revision_id)
 
101
        self.assertEqual('sha', md2.testament_sha1)
 
102
        self.assertEqual('http://example.com', md2.target_branch)
 
103
        self.assertEqual('http://example.org', md2.source_branch)
 
104
        self.assertEqual(time, md2.time)
 
105
        self.assertEqual(timezone, md2.timezone)
 
106
        self.assertEqual('diff', md2.patch_type)
 
107
        self.assertEqual('booga', md2.patch)
 
108
        self.assertEqual(None, md2.message)
 
109
        md.patch = "# Bazaar revision bundle v0.9\n#\n"
 
110
        md.message = "Hi mom!"
 
111
        md3 = merge_directive.MergeDirective.from_lines(md.to_lines())
 
112
        self.assertEqual("# Bazaar revision bundle v0.9\n#\n", md3.patch)
 
113
        self.assertEqual("bundle", md3.patch_type)
 
114
        self.assertContainsRe(md3.to_lines()[0],
 
115
            '^# Bazaar merge directive format ')
 
116
        self.assertEqual("Hi mom!", md3.message)
 
117
 
 
118
 
 
119
EMAIL1 = """To: pqm@example.com
 
120
From: J. Random Hacker <jrandom@example.com>
 
121
Subject: Commit of rev2a
 
122
 
 
123
# Bazaar merge directive format 1
 
124
# revision_id: rev2a
 
125
# target_branch: (.|\n)*
 
126
# testament_sha1: .*
 
127
# timestamp: 1970-01-01 00:08:56 \\+0001
 
128
# source_branch: (.|\n)*
 
129
"""
 
130
 
 
131
 
 
132
EMAIL2 = """To: pqm@example.com
 
133
From: J. Random Hacker <jrandom@example.com>
 
134
Subject: Commit of rev2a with special message
 
135
 
 
136
# Bazaar merge directive format 1
 
137
# revision_id: rev2a
 
138
# target_branch: (.|\n)*
 
139
# testament_sha1: .*
 
140
# timestamp: 1970-01-01 00:08:56 \\+0001
 
141
# source_branch: (.|\n)*
 
142
# message: Commit of rev2a with special message
 
143
"""
 
144
 
 
145
 
 
146
class TestMergeDirectiveBranch(tests.TestCaseWithTransport):
 
147
 
 
148
    def make_trees(self):
 
149
        tree_a = self.make_branch_and_tree('tree_a')
 
150
        tree_a.branch.get_config().set_user_option('email',
 
151
            'J. Random Hacker <jrandom@example.com>')
 
152
        self.build_tree_contents([('tree_a/file', 'content_a\ncontent_b\n')])
 
153
        tree_a.add('file')
 
154
        tree_a.commit('message', rev_id='rev1')
 
155
        tree_b = tree_a.bzrdir.sprout('tree_b').open_workingtree()
 
156
        branch_c = tree_a.bzrdir.sprout('branch_c').open_branch()
 
157
        tree_b.commit('message', rev_id='rev2b')
 
158
        self.build_tree_contents([('tree_a/file', 'content_a\ncontent_c\n')])
 
159
        tree_a.commit('Commit of rev2a', rev_id='rev2a')
 
160
        return tree_a, tree_b, branch_c
 
161
 
 
162
    def test_generate_patch(self):
 
163
        tree_a, tree_b, branch_c = self.make_trees()
 
164
        md2 = merge_directive.MergeDirective.from_objects(
 
165
            tree_a.branch.repository, 'rev2a', 500, 144, tree_b.branch.base,
 
166
            patch_type='diff', public_branch=tree_a.branch.base)
 
167
        self.assertNotContainsRe(md2.patch, 'Bazaar revision bundle')
 
168
        self.assertContainsRe(md2.patch, '\\+content_c')
 
169
        self.assertNotContainsRe(md2.patch, '\\+\\+\\+ b/')
 
170
        self.assertContainsRe(md2.patch, '\\+\\+\\+ file')
 
171
 
 
172
    def test_public_branch(self):
 
173
        tree_a, tree_b, branch_c = self.make_trees()
 
174
        self.assertRaises(errors.PublicBranchOutOfDate,
 
175
            merge_directive.MergeDirective.from_objects,
 
176
            tree_a.branch.repository, 'rev2a', 500, 144, tree_b.branch.base,
 
177
            public_branch=branch_c.base, patch_type='diff')
 
178
        # public branch is not checked if patch format is bundle.
 
179
        md1 = merge_directive.MergeDirective.from_objects(
 
180
            tree_a.branch.repository, 'rev2a', 500, 144, tree_b.branch.base,
 
181
            public_branch=branch_c.base)
 
182
        # public branch is provided with a bundle, despite possibly being out
 
183
        # of date, because it's not required if a bundle is present.
 
184
        self.assertEqual(md1.source_branch, branch_c.base)
 
185
        # Once we update the public branch, we can generate a diff.
 
186
        branch_c.pull(tree_a.branch)
 
187
        md3 = merge_directive.MergeDirective.from_objects(
 
188
            tree_a.branch.repository, 'rev2a', 500, 144, tree_b.branch.base,
 
189
            patch_type=None, public_branch=branch_c.base)
 
190
 
 
191
    def test_message(self):
 
192
        tree_a, tree_b, branch_c = self.make_trees()
 
193
        md3 = merge_directive.MergeDirective.from_objects(
 
194
            tree_a.branch.repository, 'rev2a', 500, 144, tree_b.branch.base,
 
195
            patch_type=None, public_branch=branch_c.base,
 
196
            message='Merge message')
 
197
        md3.to_lines()
 
198
        self.assertIs(None, md3.patch)
 
199
        self.assertEqual('Merge message', md3.message)
 
200
 
 
201
    def test_generate_bundle(self):
 
202
        tree_a, tree_b, branch_c = self.make_trees()
 
203
        md1 = merge_directive.MergeDirective.from_objects(
 
204
            tree_a.branch.repository, 'rev2a', 500, 144, tree_b.branch.base,
 
205
            public_branch=branch_c.base)
 
206
        self.assertContainsRe(md1.patch, 'Bazaar revision bundle')
 
207
        self.assertContainsRe(md1.patch, '\\+content_c')
 
208
        self.assertNotContainsRe(md1.patch, '\\+content_a')
 
209
        self.assertContainsRe(md1.patch, '\\+content_c')
 
210
        self.assertNotContainsRe(md1.patch, '\\+content_a')
 
211
 
 
212
    def test_signing(self):
 
213
        time = 501
 
214
        timezone = 72
 
215
        class FakeBranch(object):
 
216
            def get_config(self):
 
217
                return self
 
218
            def gpg_signing_command(self):
 
219
                return 'loopback'
 
220
        md = merge_directive.MergeDirective('example:', 'sha', time, timezone,
 
221
            'http://example.com', source_branch="http://example.org",
 
222
            patch='booga', patch_type='diff')
 
223
        old_strategy = gpg.GPGStrategy
 
224
        gpg.GPGStrategy = gpg.LoopbackGPGStrategy
 
225
        try:
 
226
            signed = md.to_signed(FakeBranch())
 
227
        finally:
 
228
            gpg.GPGStrategy = old_strategy
 
229
        self.assertContainsRe(signed, '^-----BEGIN PSEUDO-SIGNED CONTENT')
 
230
        self.assertContainsRe(signed, 'example.org')
 
231
        self.assertContainsRe(signed, 'booga')
 
232
 
 
233
    def test_email(self):
 
234
        tree_a, tree_b, branch_c = self.make_trees()
 
235
        md = merge_directive.MergeDirective.from_objects(
 
236
            tree_a.branch.repository, 'rev2a', 500, 36, tree_b.branch.base,
 
237
            patch_type=None, public_branch=tree_a.branch.base)
 
238
        message = md.to_email('pqm@example.com', tree_a.branch)
 
239
        self.assertContainsRe(message.as_string(), EMAIL1)
 
240
        md.message = 'Commit of rev2a with special message'
 
241
        message = md.to_email('pqm@example.com', tree_a.branch)
 
242
        self.assertContainsRe(message.as_string(), EMAIL2)