← 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: John Arbash Meinel
  • Date: 2011-05-11 11:35:28 UTC
  • mto: This revision was merged to the branch mainline in revision 5851.
  • Revision ID: john@arbash-meinel.com-20110511113528-qepibuwxicjrbb2h
Break compatibility with python <2.6.

This includes auditing the code for places where we were doing
explicit 'sys.version' checks and removing them as appropriate.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_send.py
1
 
# Copyright (C) 2006, 2007 Canonical Ltd
 
1
# Copyright (C) 2006-2011 Canonical Ltd
2
2
# Authors: Aaron Bentley
3
3
#
4
4
# This program is free software; you can redistribute it and/or modify
13
13
#
14
14
# You should have received a copy of the GNU General Public License
15
15
# along with this program; if not, write to the Free Software
16
 
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
17
 
 
18
 
 
19
 
import os
20
 
from StringIO import StringIO
 
16
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
17
 
 
18
 
 
19
import sys
 
20
from cStringIO import StringIO
21
21
 
22
22
from bzrlib import (
23
 
    branch as _mod_branch,
 
23
    branch,
 
24
    bzrdir,
24
25
    merge_directive,
 
26
    tests,
25
27
    )
26
28
from bzrlib.bundle import serializer
27
 
from bzrlib.bzrdir import BzrDir
28
 
from bzrlib import tests
29
 
 
30
 
 
31
 
def read_bundle(fileobj):
32
 
    md = merge_directive.MergeDirective.from_lines(fileobj.readlines())
33
 
    return serializer.read_bundle(StringIO(md.get_raw_bundle()))
34
 
 
35
 
 
36
 
class TestSend(tests.TestCaseWithTransport):
37
 
 
38
 
    def make_trees(self):
39
 
        grandparent_tree = BzrDir.create_standalone_workingtree('grandparent')
 
29
from bzrlib.transport import memory
 
30
from bzrlib.tests.scenarios import load_tests_apply_scenarios
 
31
 
 
32
 
 
33
load_tests = load_tests_apply_scenarios
 
34
 
 
35
 
 
36
class TestSendMixin(object):
 
37
 
 
38
    _default_command = ['send', '-o-']
 
39
    _default_wd = 'branch'
 
40
 
 
41
    def run_send(self, args, cmd=None, rc=0, wd=None, err_re=None):
 
42
        if cmd is None: cmd = self._default_command
 
43
        if wd is None: wd = self._default_wd
 
44
        if err_re is None: err_re = []
 
45
        return self.run_bzr(cmd + args, retcode=rc,
 
46
                            working_dir=wd,
 
47
                            error_regexes=err_re)
 
48
 
 
49
    def get_MD(self, args, cmd=None, wd='branch'):
 
50
        out = StringIO(self.run_send(args, cmd=cmd, wd=wd)[0])
 
51
        return merge_directive.MergeDirective.from_lines(out)
 
52
 
 
53
    def assertBundleContains(self, revs, args, cmd=None, wd='branch'):
 
54
        md = self.get_MD(args, cmd=cmd, wd=wd)
 
55
        br = serializer.read_bundle(StringIO(md.get_raw_bundle()))
 
56
        self.assertEqual(set(revs), set(r.revision_id for r in br.revisions))
 
57
 
 
58
 
 
59
class TestSend(tests.TestCaseWithTransport, TestSendMixin):
 
60
 
 
61
    def setUp(self):
 
62
        super(TestSend, self).setUp()
 
63
        grandparent_tree = bzrdir.BzrDir.create_standalone_workingtree(
 
64
            'grandparent')
40
65
        self.build_tree_contents([('grandparent/file1', 'grandparent')])
41
66
        grandparent_tree.add('file1')
42
 
        grandparent_tree.commit('initial commit', rev_id='revision1')
 
67
        grandparent_tree.commit('initial commit', rev_id='rev1')
 
68
 
43
69
        parent_bzrdir = grandparent_tree.bzrdir.sprout('parent')
44
70
        parent_tree = parent_bzrdir.open_workingtree()
45
 
        parent_tree.commit('next commit', rev_id='revision2')
 
71
        parent_tree.commit('next commit', rev_id='rev2')
 
72
 
46
73
        branch_tree = parent_tree.bzrdir.sprout('branch').open_workingtree()
47
74
        self.build_tree_contents([('branch/file1', 'branch')])
48
 
        branch_tree.commit('last commit', rev_id='revision3')
 
75
        branch_tree.commit('last commit', rev_id='rev3')
 
76
 
 
77
    def assertFormatIs(self, fmt_string, md):
 
78
        self.assertEqual(fmt_string, md.get_raw_bundle().splitlines()[0])
49
79
 
50
80
    def test_uses_parent(self):
51
81
        """Parent location is used as a basis by default"""
52
 
        self.make_trees()
53
 
        os.chdir('grandparent')
54
 
        errmsg = self.run_bzr('send -o-', retcode=3)[1]
 
82
        errmsg = self.run_send([], rc=3, wd='grandparent')[1]
55
83
        self.assertContainsRe(errmsg, 'No submit branch known or specified')
56
 
        os.chdir('../branch')
57
 
        stdout, stderr = self.run_bzr('send -o-')
58
 
        self.assertEqual(stderr.count('Using saved location'), 1)
59
 
        br = read_bundle(StringIO(stdout))
60
 
        self.assertRevisions(br, ['revision3'])
 
84
        stdout, stderr = self.run_send([])
 
85
        self.assertEqual(stderr.count('Using saved parent location'), 1)
 
86
        self.assertBundleContains(['rev3'], [])
61
87
 
62
88
    def test_bundle(self):
63
89
        """Bundle works like send, except -o is not required"""
64
 
        self.make_trees()
65
 
        os.chdir('grandparent')
66
 
        errmsg = self.run_bzr('bundle', retcode=3)[1]
 
90
        errmsg = self.run_send([], cmd=['bundle'], rc=3, wd='grandparent')[1]
67
91
        self.assertContainsRe(errmsg, 'No submit branch known or specified')
68
 
        os.chdir('../branch')
69
 
        stdout, stderr = self.run_bzr('bundle')
70
 
        self.assertEqual(stderr.count('Using saved location'), 1)
71
 
        br = read_bundle(StringIO(stdout))
72
 
        self.assertRevisions(br, ['revision3'])
73
 
 
74
 
    def assertRevisions(self, bi, expected):
75
 
        self.assertEqual(set(r.revision_id for r in bi.revisions),
76
 
            set(expected))
 
92
        stdout, stderr = self.run_send([], cmd=['bundle'])
 
93
        self.assertEqual(stderr.count('Using saved parent location'), 1)
 
94
        self.assertBundleContains(['rev3'], [], cmd=['bundle'])
77
95
 
78
96
    def test_uses_submit(self):
79
97
        """Submit location can be used and set"""
80
 
        self.make_trees()
81
 
        os.chdir('branch')
82
 
        br = read_bundle(StringIO(self.run_bzr('send -o-')[0]))
83
 
        self.assertRevisions(br, ['revision3'])
84
 
        br = read_bundle(StringIO(self.run_bzr('send ../grandparent -o-')[0]))
85
 
        self.assertRevisions(br, ['revision3', 'revision2'])
 
98
        self.assertBundleContains(['rev3'], [])
 
99
        self.assertBundleContains(['rev3', 'rev2'], ['../grandparent'])
86
100
        # submit location should be auto-remembered
87
 
        br = read_bundle(StringIO(self.run_bzr('send -o-')[0]))
88
 
        self.assertRevisions(br, ['revision3', 'revision2'])
89
 
        self.run_bzr('send ../parent -o-')
90
 
        br = read_bundle(StringIO(self.run_bzr('send -o-')[0]))
91
 
        self.assertRevisions(br, ['revision3', 'revision2'])
92
 
        self.run_bzr('send ../parent --remember -o-')
93
 
        br = read_bundle(StringIO(self.run_bzr('send -o-')[0]))
94
 
        self.assertRevisions(br, ['revision3'])
95
 
        err = self.run_bzr('send --remember -o-', retcode=3)[1]
96
 
        self.assertContainsRe(err, 
 
101
        self.assertBundleContains(['rev3', 'rev2'], [])
 
102
 
 
103
        self.run_send(['../parent'])
 
104
        # We still point to ../grandparent
 
105
        self.assertBundleContains(['rev3', 'rev2'], [])
 
106
        # Remember parent now
 
107
        self.run_send(['../parent', '--remember'])
 
108
        # Now we point to parent
 
109
        self.assertBundleContains(['rev3'], [])
 
110
 
 
111
        err = self.run_send(['--remember'], rc=3)[1]
 
112
        self.assertContainsRe(err,
97
113
                              '--remember requires a branch to be specified.')
98
114
 
99
115
    def test_revision_branch_interaction(self):
100
 
        self.make_trees()
101
 
        os.chdir('branch')
102
 
        bi = read_bundle(StringIO(self.run_bzr('send ../grandparent -o-')[0]))
103
 
        self.assertRevisions(bi, ['revision3', 'revision2'])
104
 
        out = StringIO(self.run_bzr('send ../grandparent -r -2 -o-')[0])
105
 
        bi = read_bundle(out)
106
 
        self.assertRevisions(bi, ['revision2'])
107
 
        sio = StringIO(self.run_bzr('send -r -2..-1 -o-')[0])
108
 
        md = merge_directive.MergeDirective.from_lines(sio.readlines())
109
 
        self.assertEqual('revision2', md.base_revision_id)
110
 
        self.assertEqual('revision3', md.revision_id)
111
 
        sio.seek(0)
112
 
        bi = read_bundle(sio)
113
 
        self.assertRevisions(bi, ['revision2', 'revision3'])
114
 
        self.run_bzr('send ../grandparent -r -2..-1 -o-')
 
116
        self.assertBundleContains(['rev3', 'rev2'], ['../grandparent'])
 
117
        self.assertBundleContains(['rev2'], ['../grandparent', '-r-2'])
 
118
        self.assertBundleContains(['rev3', 'rev2'],
 
119
                                  ['../grandparent', '-r-2..-1'])
 
120
        md = self.get_MD(['-r-2..-1'])
 
121
        self.assertEqual('rev2', md.base_revision_id)
 
122
        self.assertEqual('rev3', md.revision_id)
115
123
 
116
124
    def test_output(self):
117
125
        # check output for consistency
118
126
        # win32 stdout converts LF to CRLF,
119
127
        # which would break patch-based bundles
120
 
        self.make_trees()        
121
 
        os.chdir('branch')
122
 
        stdout = self.run_bzr_subprocess('send -o-')[0]
123
 
        br = read_bundle(StringIO(stdout))
124
 
        self.assertRevisions(br, ['revision3'])
 
128
        self.assertBundleContains(['rev3'], [])
125
129
 
126
130
    def test_no_common_ancestor(self):
127
131
        foo = self.make_branch_and_tree('foo')
128
132
        foo.commit('rev a')
129
133
        bar = self.make_branch_and_tree('bar')
130
134
        bar.commit('rev b')
131
 
        os.chdir('foo')
132
 
        self.run_bzr('send ../bar -o-')
133
 
 
134
 
    def send_directive(self, args):
135
 
        sio = StringIO(self.run_bzr(['send', '-o-'] + args)[0])
136
 
        return merge_directive.MergeDirective.from_lines(sio.readlines())
 
135
        self.run_send(['--from', 'foo', '../bar'], wd='foo')
137
136
 
138
137
    def test_content_options(self):
139
138
        """--no-patch and --no-bundle should work and be independant"""
140
 
        self.make_trees()
141
 
        os.chdir('branch')
142
 
        md = self.send_directive([])
143
 
        self.assertIsNot(None, md.bundle)
144
 
        self.assertIsNot(None, md.patch)
145
 
 
146
 
        md = self.send_directive(['--format=0.9'])
147
 
        self.assertIsNot(None, md.bundle)
148
 
        self.assertIsNot(None, md.patch)
149
 
 
150
 
        md = self.send_directive(['--no-patch'])
 
139
        md = self.get_MD([])
 
140
        self.assertIsNot(None, md.bundle)
 
141
        self.assertIsNot(None, md.patch)
 
142
 
 
143
        md = self.get_MD(['--format=0.9'])
 
144
        self.assertIsNot(None, md.bundle)
 
145
        self.assertIsNot(None, md.patch)
 
146
 
 
147
        md = self.get_MD(['--no-patch'])
151
148
        self.assertIsNot(None, md.bundle)
152
149
        self.assertIs(None, md.patch)
153
150
        self.run_bzr_error(['Format 0.9 does not permit bundle with no patch'],
154
 
                      'send --no-patch --format=0.9 -o-')
155
 
 
156
 
        md = self.send_directive(['--no-bundle', '.', '.'])
 
151
                           ['send', '--no-patch', '--format=0.9', '-o-'],
 
152
                           working_dir='branch')
 
153
        md = self.get_MD(['--no-bundle', '.', '.'])
157
154
        self.assertIs(None, md.bundle)
158
155
        self.assertIsNot(None, md.patch)
159
156
 
160
 
        md = self.send_directive(['--no-bundle', '--format=0.9', '../parent',
 
157
        md = self.get_MD(['--no-bundle', '--format=0.9', '../parent',
161
158
                                  '.'])
162
159
        self.assertIs(None, md.bundle)
163
160
        self.assertIsNot(None, md.patch)
164
161
 
165
 
        md = self.send_directive(['--no-bundle', '--no-patch', '.', '.'])
 
162
        md = self.get_MD(['--no-bundle', '--no-patch', '.', '.'])
166
163
        self.assertIs(None, md.bundle)
167
164
        self.assertIs(None, md.patch)
168
165
 
169
 
        md = self.send_directive(['--no-bundle', '--no-patch', '--format=0.9',
170
 
                                  '../parent', '.'])
 
166
        md = self.get_MD(['--no-bundle', '--no-patch', '--format=0.9',
 
167
                          '../parent', '.'])
171
168
        self.assertIs(None, md.bundle)
172
169
        self.assertIs(None, md.patch)
173
170
 
174
171
    def test_from_option(self):
175
 
        self.make_trees()
176
172
        self.run_bzr('send', retcode=3)
177
 
        md = self.send_directive(['--from', 'branch'])
178
 
        self.assertEqual('revision3', md.revision_id)
179
 
        md = self.send_directive(['-f', 'branch'])
180
 
        self.assertEqual('revision3', md.revision_id)
 
173
        md = self.get_MD(['--from', 'branch'])
 
174
        self.assertEqual('rev3', md.revision_id)
 
175
        md = self.get_MD(['-f', 'branch'])
 
176
        self.assertEqual('rev3', md.revision_id)
181
177
 
182
178
    def test_output_option(self):
183
 
        self.make_trees()
184
179
        stdout = self.run_bzr('send -f branch --output file1')[0]
185
180
        self.assertEqual('', stdout)
186
181
        md_file = open('file1', 'rb')
187
182
        self.addCleanup(md_file.close)
188
 
        self.assertContainsRe(md_file.read(), 'revision3')
 
183
        self.assertContainsRe(md_file.read(), 'rev3')
189
184
        stdout = self.run_bzr('send -f branch --output -')[0]
190
 
        self.assertContainsRe(stdout, 'revision3')
 
185
        self.assertContainsRe(stdout, 'rev3')
 
186
 
 
187
    def test_note_revisions(self):
 
188
        stderr = self.run_send([])[1]
 
189
        self.assertEndsWith(stderr, '\nBundling 1 revision(s).\n')
191
190
 
192
191
    def test_mailto_option(self):
193
 
        self.make_trees()
194
 
        branch = _mod_branch.Branch.open('branch')
195
 
        branch.get_config().set_user_option('mail_client', 'bogus')
196
 
        self.run_bzr_error(('No mail-to address specified',), 'send -f branch')
197
 
        self.run_bzr('send -f branch -o-')
 
192
        b = branch.Branch.open('branch')
 
193
        b.get_config().set_user_option('mail_client', 'editor')
 
194
        self.run_bzr_error(
 
195
            ('No mail-to address \\(--mail-to\\) or output \\(-o\\) specified',
 
196
            ), 'send -f branch')
 
197
        b.get_config().set_user_option('mail_client', 'bogus')
 
198
        self.run_send([])
198
199
        self.run_bzr_error(('Unknown mail client: bogus',),
199
200
                           'send -f branch --mail-to jrandom@example.org')
200
 
        branch.get_config().set_user_option('submit_to', 'jrandom@example.org')
 
201
        b.get_config().set_user_option('submit_to', 'jrandom@example.org')
 
202
        self.run_bzr_error(('Unknown mail client: bogus',),
 
203
                           'send -f branch')
 
204
 
 
205
    def test_mailto_child_option(self):
 
206
        """Make sure that child_submit_to is used."""
 
207
        b = branch.Branch.open('branch')
 
208
        b.get_config().set_user_option('mail_client', 'bogus')
 
209
        parent = branch.Branch.open('parent')
 
210
        parent.get_config().set_user_option('child_submit_to',
 
211
                           'somebody@example.org')
201
212
        self.run_bzr_error(('Unknown mail client: bogus',),
202
213
                           'send -f branch')
203
214
 
204
215
    def test_format(self):
205
 
        self.make_trees()
206
 
        s = StringIO(self.run_bzr('send -f branch -o- --format=4')[0])
207
 
        md = merge_directive.MergeDirective.from_lines(s.readlines())
 
216
        md = self.get_MD(['--format=4'])
208
217
        self.assertIs(merge_directive.MergeDirective2, md.__class__)
209
 
        s = StringIO(self.run_bzr('send -f branch -o- --format=0.9')[0])
210
 
        md = merge_directive.MergeDirective.from_lines(s.readlines())
211
 
        self.assertContainsRe(md.get_raw_bundle().splitlines()[0],
212
 
            '# Bazaar revision bundle v0.9')
213
 
        s = StringIO(self.run_bzr('bundle -f branch -o- --format=0.9')[0])
214
 
        md = merge_directive.MergeDirective.from_lines(s.readlines())
215
 
        self.assertContainsRe(md.get_raw_bundle().splitlines()[0],
216
 
            '# Bazaar revision bundle v0.9')
 
218
        self.assertFormatIs('# Bazaar revision bundle v4', md)
 
219
 
 
220
        md = self.get_MD(['--format=0.9'])
 
221
        self.assertFormatIs('# Bazaar revision bundle v0.9', md)
 
222
 
 
223
        md = self.get_MD(['--format=0.9'], cmd=['bundle'])
 
224
        self.assertFormatIs('# Bazaar revision bundle v0.9', md)
217
225
        self.assertIs(merge_directive.MergeDirective, md.__class__)
 
226
 
218
227
        self.run_bzr_error(['Bad value .* for option .format.'],
219
228
                            'send -f branch -o- --format=0.999')[0]
220
229
 
 
230
    def test_format_child_option(self):
 
231
        parent_config = branch.Branch.open('parent').get_config()
 
232
        parent_config.set_user_option('child_submit_format', '4')
 
233
        md = self.get_MD([])
 
234
        self.assertIs(merge_directive.MergeDirective2, md.__class__)
 
235
 
 
236
        parent_config.set_user_option('child_submit_format', '0.9')
 
237
        md = self.get_MD([])
 
238
        self.assertFormatIs('# Bazaar revision bundle v0.9', md)
 
239
 
 
240
        md = self.get_MD([], cmd=['bundle'])
 
241
        self.assertFormatIs('# Bazaar revision bundle v0.9', md)
 
242
        self.assertIs(merge_directive.MergeDirective, md.__class__)
 
243
 
 
244
        parent_config.set_user_option('child_submit_format', '0.999')
 
245
        self.run_bzr_error(["No such send format '0.999'"],
 
246
                            'send -f branch -o-')[0]
 
247
 
221
248
    def test_message_option(self):
222
 
        self.make_trees()
223
249
        self.run_bzr('send', retcode=3)
224
 
        md = self.send_directive(['--from', 'branch'])
 
250
        md = self.get_MD([])
225
251
        self.assertIs(None, md.message)
226
 
        md = self.send_directive(['--from', 'branch', '-m', 'my message'])
 
252
        md = self.get_MD(['-m', 'my message'])
227
253
        self.assertEqual('my message', md.message)
228
254
 
229
255
    def test_omitted_revision(self):
230
 
        self.make_trees()
231
 
        md = self.send_directive(['-r-2..', '--from', 'branch'])
232
 
        self.assertEqual('revision2', md.base_revision_id)
233
 
        self.assertEqual('revision3', md.revision_id)
234
 
        md = self.send_directive(['-r..3', '--from', 'branch',
235
 
                                 'grandparent'])
236
 
        self.assertEqual('revision1', md.base_revision_id)
237
 
        self.assertEqual('revision3', md.revision_id)
 
256
        md = self.get_MD(['-r-2..'])
 
257
        self.assertEqual('rev2', md.base_revision_id)
 
258
        self.assertEqual('rev3', md.revision_id)
 
259
        md = self.get_MD(['-r..3', '--from', 'branch', 'grandparent'], wd='.')
 
260
        self.assertEqual('rev1', md.base_revision_id)
 
261
        self.assertEqual('rev3', md.revision_id)
 
262
 
 
263
    def test_nonexistant_branch(self):
 
264
        self.vfs_transport_factory = memory.MemoryServer
 
265
        location = self.get_url('absentdir/')
 
266
        out, err = self.run_bzr(["send", "--from", location], retcode=3)
 
267
        self.assertEqual(out, '')
 
268
        self.assertEqual(err, 'bzr: ERROR: Not a branch: "%s".\n' % location)
 
269
 
 
270
 
 
271
class TestSendStrictMixin(TestSendMixin):
 
272
 
 
273
    def make_parent_and_local_branches(self):
 
274
        # Create a 'parent' branch as the base
 
275
        self.parent_tree = bzrdir.BzrDir.create_standalone_workingtree('parent')
 
276
        self.build_tree_contents([('parent/file', 'parent')])
 
277
        self.parent_tree.add('file')
 
278
        self.parent_tree.commit('first commit', rev_id='parent')
 
279
        # Branch 'local' from parent and do a change
 
280
        local_bzrdir = self.parent_tree.bzrdir.sprout('local')
 
281
        self.local_tree = local_bzrdir.open_workingtree()
 
282
        self.build_tree_contents([('local/file', 'local')])
 
283
        self.local_tree.commit('second commit', rev_id='local')
 
284
 
 
285
    _default_command = ['send', '-o-', '../parent']
 
286
    _default_wd = 'local'
 
287
    _default_sent_revs = ['local']
 
288
    _default_errors = ['Working tree ".*/local/" has uncommitted '
 
289
                       'changes \(See bzr status\)\.',]
 
290
    _default_additional_error = 'Use --no-strict to force the send.\n'
 
291
    _default_additional_warning = 'Uncommitted changes will not be sent.'
 
292
 
 
293
    def set_config_send_strict(self, value):
 
294
        # set config var (any of bazaar.conf, locations.conf, branch.conf
 
295
        # should do)
 
296
        conf = self.local_tree.branch.get_config()
 
297
        conf.set_user_option('send_strict', value)
 
298
 
 
299
    def assertSendFails(self, args):
 
300
        out, err = self.run_send(args, rc=3, err_re=self._default_errors)
 
301
        self.assertContainsRe(err, self._default_additional_error)
 
302
 
 
303
    def assertSendSucceeds(self, args, revs=None, with_warning=False):
 
304
        if with_warning:
 
305
            err_re = self._default_errors
 
306
        else:
 
307
            err_re = []
 
308
        if revs is None:
 
309
            revs = self._default_sent_revs
 
310
        out, err = self.run_send(args, err_re=err_re)
 
311
        bundling_revs = 'Bundling %d revision(s).\n' % len(revs)
 
312
        if with_warning:
 
313
            self.assertContainsRe(err, self._default_additional_warning)
 
314
            self.assertEndsWith(err, bundling_revs)
 
315
        else:
 
316
            self.assertEquals(bundling_revs, err)
 
317
        md = merge_directive.MergeDirective.from_lines(StringIO(out))
 
318
        self.assertEqual('parent', md.base_revision_id)
 
319
        br = serializer.read_bundle(StringIO(md.get_raw_bundle()))
 
320
        self.assertEqual(set(revs), set(r.revision_id for r in br.revisions))
 
321
 
 
322
 
 
323
class TestSendStrictWithoutChanges(tests.TestCaseWithTransport,
 
324
                                   TestSendStrictMixin):
 
325
 
 
326
    def setUp(self):
 
327
        super(TestSendStrictWithoutChanges, self).setUp()
 
328
        self.make_parent_and_local_branches()
 
329
 
 
330
    def test_send_default(self):
 
331
        self.assertSendSucceeds([])
 
332
 
 
333
    def test_send_strict(self):
 
334
        self.assertSendSucceeds(['--strict'])
 
335
 
 
336
    def test_send_no_strict(self):
 
337
        self.assertSendSucceeds(['--no-strict'])
 
338
 
 
339
    def test_send_config_var_strict(self):
 
340
        self.set_config_send_strict('true')
 
341
        self.assertSendSucceeds([])
 
342
 
 
343
    def test_send_config_var_no_strict(self):
 
344
        self.set_config_send_strict('false')
 
345
        self.assertSendSucceeds([])
 
346
 
 
347
 
 
348
class TestSendStrictWithChanges(tests.TestCaseWithTransport,
 
349
                                   TestSendStrictMixin):
 
350
 
 
351
    # These are textually the same as test_push.strict_push_change_scenarios,
 
352
    # but since the functions are reimplemented here, the definitions are left
 
353
    # here too.
 
354
    scenarios = [
 
355
        ('uncommitted',
 
356
         dict(_changes_type='_uncommitted_changes')),
 
357
        ('pending_merges',
 
358
         dict(_changes_type='_pending_merges')),
 
359
        ('out-of-sync-trees',
 
360
         dict(_changes_type='_out_of_sync_trees')),
 
361
        ]
 
362
 
 
363
    _changes_type = None # Set by load_tests
 
364
 
 
365
    def setUp(self):
 
366
        super(TestSendStrictWithChanges, self).setUp()
 
367
        # load tests set _changes_types to the name of the method we want to
 
368
        # call now
 
369
        do_changes_func = getattr(self, self._changes_type)
 
370
        do_changes_func()
 
371
 
 
372
    def _uncommitted_changes(self):
 
373
        self.make_parent_and_local_branches()
 
374
        # Make a change without committing it
 
375
        self.build_tree_contents([('local/file', 'modified')])
 
376
 
 
377
    def _pending_merges(self):
 
378
        self.make_parent_and_local_branches()
 
379
        # Create 'other' branch containing a new file
 
380
        other_bzrdir = self.parent_tree.bzrdir.sprout('other')
 
381
        other_tree = other_bzrdir.open_workingtree()
 
382
        self.build_tree_contents([('other/other-file', 'other')])
 
383
        other_tree.add('other-file')
 
384
        other_tree.commit('other commit', rev_id='other')
 
385
        # Merge and revert, leaving a pending merge
 
386
        self.local_tree.merge_from_branch(other_tree.branch)
 
387
        self.local_tree.revert(filenames=['other-file'], backups=False)
 
388
 
 
389
    def _out_of_sync_trees(self):
 
390
        self.make_parent_and_local_branches()
 
391
        self.run_bzr(['checkout', '--lightweight', 'local', 'checkout'])
 
392
        # Make a change and commit it
 
393
        self.build_tree_contents([('local/file', 'modified in local')])
 
394
        self.local_tree.commit('modify file', rev_id='modified-in-local')
 
395
        # Exercise commands from the checkout directory
 
396
        self._default_wd = 'checkout'
 
397
        self._default_errors = ["Working tree is out of date, please run"
 
398
                                " 'bzr update'\.",]
 
399
        self._default_sent_revs = ['modified-in-local', 'local']
 
400
 
 
401
    def test_send_default(self):
 
402
        self.assertSendSucceeds([], with_warning=True)
 
403
 
 
404
    def test_send_with_revision(self):
 
405
        self.assertSendSucceeds(['-r', 'revid:local'], revs=['local'])
 
406
 
 
407
    def test_send_no_strict(self):
 
408
        self.assertSendSucceeds(['--no-strict'])
 
409
 
 
410
    def test_send_strict_with_changes(self):
 
411
        self.assertSendFails(['--strict'])
 
412
 
 
413
    def test_send_respect_config_var_strict(self):
 
414
        self.set_config_send_strict('true')
 
415
        self.assertSendFails([])
 
416
        self.assertSendSucceeds(['--no-strict'])
 
417
 
 
418
    def test_send_bogus_config_var_ignored(self):
 
419
        self.set_config_send_strict("I'm unsure")
 
420
        self.assertSendSucceeds([], with_warning=True)
 
421
 
 
422
    def test_send_no_strict_command_line_override_config(self):
 
423
        self.set_config_send_strict('true')
 
424
        self.assertSendFails([])
 
425
        self.assertSendSucceeds(['--no-strict'])
 
426
 
 
427
    def test_send_strict_command_line_override_config(self):
 
428
        self.set_config_send_strict('false')
 
429
        self.assertSendSucceeds([])
 
430
        self.assertSendFails(['--strict'])
 
431
 
 
432
 
 
433
class TestBundleStrictWithoutChanges(TestSendStrictWithoutChanges):
 
434
 
 
435
    _default_command = ['bundle-revisions', '../parent']