← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

[merge] bzr.dev 2255, resolve conflicts, update copyrights

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_bundle.py
1
 
# Copyright (C) 2006 by Canonical Ltd
 
1
# Copyright (C) 2006 Canonical Ltd
2
2
# Authors: Aaron Bentley
3
3
#
4
4
# This program is free software; you can redistribute it and/or modify
82
82
        bi = read_bundle(StringIO(self.run_bzr('bundle', '-r', '-2..-1')[0]))
83
83
        self.assertRevisions(bi, ['revision3'])
84
84
        self.run_bzr('bundle', '../grandparent', '-r', '-2..-1', retcode=3)
 
85
 
 
86
    def test_output(self):
 
87
        # check output for consistency
 
88
        # win32 stdout converts LF to CRLF,
 
89
        # and this is breaks the created bundle
 
90
        self.make_trees()        
 
91
        os.chdir('branch')
 
92
        stdout = self.run_bzr_subprocess('bundle')[0]
 
93
        br = read_bundle(StringIO(stdout))
 
94
        self.assertRevisions(br, ['revision3'])