~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

remove all trailing whitespace from bzr source

Show diffs side-by-side

added added

removed removed

Lines of Context:
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))
214
214
        branch = _mod_branch.Branch.open('branch')
215
215
        branch.get_config().set_user_option('mail_client', 'bogus')
216
216
        parent = _mod_branch.Branch.open('parent')
217
 
        parent.get_config().set_user_option('child_submit_to', 
 
217
        parent.get_config().set_user_option('child_submit_to',
218
218
                           'somebody@example.org')
219
219
        self.run_bzr_error(('Unknown mail client: bogus',),
220
220
                           'send -f branch')