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

  • Committer: Jelmer Vernooij
  • Date: 2017-05-22 00:56:52 UTC
  • mfrom: (6621.2.26 py3_pokes)
  • Revision ID: jelmer@jelmer.uk-20170522005652-yjahcr9hwmjkno7n
Merge Python3 porting work ('py3 pokes')

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/blackbox/test_send.py
16
16
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
17
17
 
18
18
 
19
 
from cStringIO import StringIO
20
 
 
21
 
from breezy import (
 
19
from ... import (
22
20
    branch,
23
21
    merge_directive,
24
22
    tests,
25
23
    )
26
 
from breezy.controldir import ControlDir
27
 
from breezy.bundle import serializer
28
 
from breezy.transport import memory
29
 
from breezy.tests import (
 
24
from ...controldir import ControlDir
 
25
from ...bundle import serializer
 
26
from ...sixish import (
 
27
    BytesIO,
 
28
    )
 
29
from ...transport import memory
 
30
from .. import (
30
31
    scenarios,
31
32
    )
32
 
from breezy.tests.matchers import ContainsNoVfsCalls
 
33
from ..matchers import ContainsNoVfsCalls
33
34
 
34
35
 
35
36
load_tests = scenarios.load_tests_apply_scenarios
49
50
                            error_regexes=err_re)
50
51
 
51
52
    def get_MD(self, args, cmd=None, wd='branch'):
52
 
        out = StringIO(self.run_send(args, cmd=cmd, wd=wd)[0])
 
53
        out = BytesIO(self.run_send(args, cmd=cmd, wd=wd)[0])
53
54
        return merge_directive.MergeDirective.from_lines(out)
54
55
 
55
56
    def assertBundleContains(self, revs, args, cmd=None, wd='branch'):
56
57
        md = self.get_MD(args, cmd=cmd, wd=wd)
57
 
        br = serializer.read_bundle(StringIO(md.get_raw_bundle()))
 
58
        br = serializer.read_bundle(BytesIO(md.get_raw_bundle()))
58
59
        self.assertEqual(set(revs), set(r.revision_id for r in br.revisions))
59
60
 
60
61
 
317
318
            self.assertEndsWith(err, bundling_revs)
318
319
        else:
319
320
            self.assertEqual(bundling_revs, err)
320
 
        md = merge_directive.MergeDirective.from_lines(StringIO(out))
 
321
        md = merge_directive.MergeDirective.from_lines(BytesIO(out))
321
322
        self.assertEqual('parent', md.base_revision_id)
322
 
        br = serializer.read_bundle(StringIO(md.get_raw_bundle()))
 
323
        br = serializer.read_bundle(BytesIO(md.get_raw_bundle()))
323
324
        self.assertEqual(set(revs), set(r.revision_id for r in br.revisions))
324
325
 
325
326