/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/blackbox/test_send.py

merge bzr.dev r4054

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_send.py
94
94
        br = read_bundle(StringIO(self.run_bzr('send -o-')[0]))
95
95
        self.assertRevisions(br, ['revision3'])
96
96
        err = self.run_bzr('send --remember -o-', retcode=3)[1]
97
 
        self.assertContainsRe(err, 
 
97
        self.assertContainsRe(err,
98
98
                              '--remember requires a branch to be specified.')
99
99
 
100
100
    def test_revision_branch_interaction(self):
118
118
        # check output for consistency
119
119
        # win32 stdout converts LF to CRLF,
120
120
        # which would break patch-based bundles
121
 
        self.make_trees()        
 
121
        self.make_trees()
122
122
        os.chdir('branch')
123
123
        stdout = self.run_bzr_subprocess('send -o-')[0]
124
124
        br = read_bundle(StringIO(stdout))
199
199
        self.make_trees()
200
200
        branch = _mod_branch.Branch.open('branch')
201
201
        branch.get_config().set_user_option('mail_client', 'editor')
202
 
        self.run_bzr_error(('No mail-to address specified',), 'send -f branch')
 
202
        self.run_bzr_error(
 
203
            ('No mail-to address \\(--mail-to\\) or output \\(-o\\) specified',
 
204
            ), 'send -f branch')
203
205
        branch.get_config().set_user_option('mail_client', 'bogus')
204
206
        self.run_bzr('send -f branch -o-')
205
207
        self.run_bzr_error(('Unknown mail client: bogus',),
214
216
        branch = _mod_branch.Branch.open('branch')
215
217
        branch.get_config().set_user_option('mail_client', 'bogus')
216
218
        parent = _mod_branch.Branch.open('parent')
217
 
        parent.get_config().set_user_option('child_submit_to', 
 
219
        parent.get_config().set_user_option('child_submit_to',
218
220
                           'somebody@example.org')
219
221
        self.run_bzr_error(('Unknown mail client: bogus',),
220
222
                           'send -f branch')