← 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: Matt Nordhoff
  • Date: 2009-04-04 02:50:01 UTC
  • mfrom: (4253 +trunk)
  • mto: This revision was merged to the branch mainline in revision 4256.
  • Revision ID: mnordhoff@mattnordhoff.com-20090404025001-z1403k0tatmc8l91
Merge bzr.dev, fixing conflicts.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_send.py
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
 
16
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
17
17
 
18
18
 
19
19
import os
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))
216
216
        branch = _mod_branch.Branch.open('branch')
217
217
        branch.get_config().set_user_option('mail_client', 'bogus')
218
218
        parent = _mod_branch.Branch.open('parent')
219
 
        parent.get_config().set_user_option('child_submit_to', 
 
219
        parent.get_config().set_user_option('child_submit_to',
220
220
                           'somebody@example.org')
221
221
        self.run_bzr_error(('Unknown mail client: bogus',),
222
222
                           'send -f branch')