← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/blackbox/test_send.py

  • Committer: Alexander Belchenko
  • Date: 2007-08-10 09:04:38 UTC
  • mto: This revision was merged to the branch mainline in revision 2694.
  • Revision ID: bialix@ukr.net-20070810090438-0835xdz0rl8825qv
fixes after Ian's review

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_send.py
17
17
 
18
18
 
19
19
import os
20
 
import sys
21
20
from StringIO import StringIO
22
21
 
23
 
from bzrlib import (
24
 
    branch as _mod_branch,
25
 
    merge_directive,
26
 
    )
 
22
from bzrlib import merge_directive
27
23
from bzrlib.bundle import serializer
28
24
from bzrlib.bzrdir import BzrDir
29
25
from bzrlib import tests
38
34
 
39
35
    def make_trees(self):
40
36
        grandparent_tree = BzrDir.create_standalone_workingtree('grandparent')
41
 
        self.build_tree_contents([('grandparent/file1', 'grandparent')])
42
 
        grandparent_tree.add('file1')
43
37
        grandparent_tree.commit('initial commit', rev_id='revision1')
44
38
        parent_bzrdir = grandparent_tree.bzrdir.sprout('parent')
45
39
        parent_tree = parent_bzrdir.open_workingtree()
46
40
        parent_tree.commit('next commit', rev_id='revision2')
47
41
        branch_tree = parent_tree.bzrdir.sprout('branch').open_workingtree()
48
 
        self.build_tree_contents([('branch/file1', 'branch')])
49
42
        branch_tree.commit('last commit', rev_id='revision3')
50
43
 
51
44
    def test_uses_parent(self):
60
53
        br = read_bundle(StringIO(stdout))
61
54
        self.assertRevisions(br, ['revision3'])
62
55
 
63
 
    def test_bundle(self):
64
 
        """Bundle works like send, except -o is not required"""
65
 
        self.make_trees()
66
 
        os.chdir('grandparent')
67
 
        errmsg = self.run_bzr('bundle', retcode=3)[1]
68
 
        self.assertContainsRe(errmsg, 'No submit branch known or specified')
69
 
        os.chdir('../branch')
70
 
        stdout, stderr = self.run_bzr('bundle')
71
 
        self.assertEqual(stderr.count('Using saved location'), 1)
72
 
        br = read_bundle(StringIO(stdout))
73
 
        self.assertRevisions(br, ['revision3'])
74
 
 
75
56
    def assertRevisions(self, bi, expected):
76
57
        self.assertEqual(set(r.revision_id for r in bi.revisions),
77
58
            set(expected))
120
101
        # which would break patch-based bundles
121
102
        self.make_trees()        
122
103
        os.chdir('branch')
123
 
        stdout = self.run_bzr_subprocess('send -o-')[0]
 
104
        stdout = self.run_bzr_subprocess('send', '-o-')[0]
124
105
        br = read_bundle(StringIO(stdout))
125
106
        self.assertRevisions(br, ['revision3'])
126
107
 
143
124
        md = self.send_directive([])
144
125
        self.assertIsNot(None, md.bundle)
145
126
        self.assertIsNot(None, md.patch)
146
 
 
147
 
        md = self.send_directive(['--format=0.9'])
148
 
        self.assertIsNot(None, md.bundle)
149
 
        self.assertIsNot(None, md.patch)
150
 
 
151
127
        md = self.send_directive(['--no-patch'])
152
128
        self.assertIsNot(None, md.bundle)
153
129
        self.assertIs(None, md.patch)
154
 
        self.run_bzr_error(['Format 0.9 does not permit bundle with no patch'],
155
 
                      'send --no-patch --format=0.9 -o-')
156
 
 
157
130
        md = self.send_directive(['--no-bundle', '.', '.'])
158
131
        self.assertIs(None, md.bundle)
159
132
        self.assertIsNot(None, md.patch)
160
 
 
161
 
        md = self.send_directive(['--no-bundle', '--format=0.9', '../parent',
162
 
                                  '.'])
163
 
        self.assertIs(None, md.bundle)
164
 
        self.assertIsNot(None, md.patch)
165
 
 
166
133
        md = self.send_directive(['--no-bundle', '--no-patch', '.', '.'])
167
134
        self.assertIs(None, md.bundle)
168
135
        self.assertIs(None, md.patch)
169
136
 
170
 
        md = self.send_directive(['--no-bundle', '--no-patch', '--format=0.9',
171
 
                                  '../parent', '.'])
172
 
        self.assertIs(None, md.bundle)
173
 
        self.assertIs(None, md.patch)
174
 
 
175
137
    def test_from_option(self):
176
138
        self.make_trees()
177
139
        self.run_bzr('send', retcode=3)
190
152
        stdout = self.run_bzr('send -f branch --output -')[0]
191
153
        self.assertContainsRe(stdout, 'revision3')
192
154
 
193
 
    def test_mailto_option(self):
194
 
        self.make_trees()
195
 
        branch = _mod_branch.Branch.open('branch')
196
 
        branch.get_config().set_user_option('mail_client', 'editor')
197
 
        self.run_bzr_error(('No mail-to address specified',), 'send -f branch')
198
 
        branch.get_config().set_user_option('mail_client', 'bogus')
199
 
        self.run_bzr('send -f branch -o-')
200
 
        self.run_bzr_error(('Unknown mail client: bogus',),
201
 
                           'send -f branch --mail-to jrandom@example.org')
202
 
        branch.get_config().set_user_option('submit_to', 'jrandom@example.org')
203
 
        self.run_bzr_error(('Unknown mail client: bogus',),
204
 
                           'send -f branch')
205
 
 
206
 
    def test_mailto_child_option(self):
207
 
        """Make sure that child_submit_to is used."""
208
 
        self.make_trees()
209
 
        branch = _mod_branch.Branch.open('branch')
210
 
        branch.get_config().set_user_option('mail_client', 'bogus')
211
 
        parent = _mod_branch.Branch.open('parent')
212
 
        parent.get_config().set_user_option('child_submit_to', 
213
 
                           'somebody@example.org')
214
 
        self.run_bzr_error(('Unknown mail client: bogus',),
215
 
                           'send -f branch')
216
 
 
217
 
    def test_format(self):
218
 
        self.make_trees()
219
 
        s = StringIO(self.run_bzr('send -f branch -o- --format=4')[0])
220
 
        md = merge_directive.MergeDirective.from_lines(s.readlines())
221
 
        self.assertIs(merge_directive.MergeDirective2, md.__class__)
222
 
        s = StringIO(self.run_bzr('send -f branch -o- --format=0.9')[0])
223
 
        md = merge_directive.MergeDirective.from_lines(s.readlines())
224
 
        self.assertContainsRe(md.get_raw_bundle().splitlines()[0],
225
 
            '# Bazaar revision bundle v0.9')
226
 
        s = StringIO(self.run_bzr('bundle -f branch -o- --format=0.9')[0])
227
 
        md = merge_directive.MergeDirective.from_lines(s.readlines())
228
 
        self.assertContainsRe(md.get_raw_bundle().splitlines()[0],
229
 
            '# Bazaar revision bundle v0.9')
230
 
        self.assertIs(merge_directive.MergeDirective, md.__class__)
231
 
        self.run_bzr_error(['Bad value .* for option .format.'],
232
 
                            'send -f branch -o- --format=0.999')[0]
233
 
 
234
 
    def test_message_option(self):
235
 
        self.make_trees()
236
 
        self.run_bzr('send', retcode=3)
237
 
        md = self.send_directive(['--from', 'branch'])
238
 
        self.assertIs(None, md.message)
239
 
        md = self.send_directive(['--from', 'branch', '-m', 'my message'])
240
 
        self.assertEqual('my message', md.message)
241
 
 
242
 
    def test_omitted_revision(self):
243
 
        self.make_trees()
244
 
        md = self.send_directive(['-r-2..', '--from', 'branch'])
245
 
        self.assertEqual('revision2', md.base_revision_id)
246
 
        self.assertEqual('revision3', md.revision_id)
247
 
        md = self.send_directive(['-r..3', '--from', 'branch',
248
 
                                 'grandparent'])
249
 
        self.assertEqual('revision1', md.base_revision_id)
250
 
        self.assertEqual('revision3', md.revision_id)
251
 
 
252
 
    def test_nonexistant_branch(self):
253
 
        if sys.platform == "win32":
254
 
            location = "C:/i/do/not/exist/"
255
 
        else:
256
 
            location = "/i/do/not/exist/"
257
 
        out, err = self.run_bzr(["send", "--from", location], retcode=3)
258
 
        self.assertEqual(out, '')
259
 
        self.assertEqual(err, 'bzr: ERROR: Not a branch: "%s".\n' % location)
 
155
    def test_output_option_required(self):
 
156
        self.make_trees()
 
157
        self.run_bzr_error(('File must be specified with --output',),
 
158
                           'send -f branch')