← 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: Canonical.com Patch Queue Manager
  • Date: 2007-11-03 01:53:30 UTC
  • mfrom: (2955.1.1 trunk)
  • Revision ID: pqm@pqm.ubuntu.com-20071103015330-pt1tec7wyxwwcey8
Fix #158972 don't use timeout for HttpServer

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
22
from bzrlib import (
56
55
        self.assertContainsRe(errmsg, 'No submit branch known or specified')
57
56
        os.chdir('../branch')
58
57
        stdout, stderr = self.run_bzr('send -o-')
59
 
        self.assertEqual(stderr.count('Using saved parent location'), 1)
 
58
        self.assertEqual(stderr.count('Using saved location'), 1)
60
59
        br = read_bundle(StringIO(stdout))
61
60
        self.assertRevisions(br, ['revision3'])
62
61
 
68
67
        self.assertContainsRe(errmsg, 'No submit branch known or specified')
69
68
        os.chdir('../branch')
70
69
        stdout, stderr = self.run_bzr('bundle')
71
 
        self.assertEqual(stderr.count('Using saved parent location'), 1)
 
70
        self.assertEqual(stderr.count('Using saved location'), 1)
72
71
        br = read_bundle(StringIO(stdout))
73
72
        self.assertRevisions(br, ['revision3'])
74
73
 
193
192
    def test_mailto_option(self):
194
193
        self.make_trees()
195
194
        branch = _mod_branch.Branch.open('branch')
196
 
        branch.get_config().set_user_option('mail_client', 'editor')
 
195
        branch.get_config().set_user_option('mail_client', 'bogus')
197
196
        self.run_bzr_error(('No mail-to address specified',), 'send -f branch')
198
 
        branch.get_config().set_user_option('mail_client', 'bogus')
199
197
        self.run_bzr('send -f branch -o-')
200
198
        self.run_bzr_error(('Unknown mail client: bogus',),
201
199
                           'send -f branch --mail-to jrandom@example.org')
203
201
        self.run_bzr_error(('Unknown mail client: bogus',),
204
202
                           'send -f branch')
205
203
 
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
204
    def test_format(self):
218
205
        self.make_trees()
219
206
        s = StringIO(self.run_bzr('send -f branch -o- --format=4')[0])
248
235
                                 'grandparent'])
249
236
        self.assertEqual('revision1', md.base_revision_id)
250
237
        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)