/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_pull.py

  • Committer: Breezy landing bot
  • Author(s): Jelmer Vernooij
  • Date: 2018-07-14 19:47:11 UTC
  • mfrom: (7027.4.12 python3-blackbox)
  • Revision ID: breezy.the.bot@gmail.com-20180714194711-h73vd0gzphiab6vf
Change run_bzr to use StringIOWithEncoding for stderr and stdout on python 3.

Merged from https://code.launchpad.net/~jelmer/brz/python3-blackbox/+merge/349090

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/blackbox/test_pull.py
320
320
        tree_a.commit('bar')
321
321
        tree_b = self.make_branch_and_tree('tree_b')
322
322
        out = self.run_bzr('pull --verbose -d tree_b tree_a')[0]
323
 
        self.assertContainsRe(out, b'bar')
324
 
        self.assertNotContainsRe(out, b'added:')
325
 
        self.assertNotContainsRe(out, b'foo')
 
323
        self.assertContainsRe(out, 'bar')
 
324
        self.assertNotContainsRe(out, 'added:')
 
325
        self.assertNotContainsRe(out, 'foo')
326
326
 
327
327
    def test_pull_quiet(self):
328
328
        """Check that brz pull --quiet does not print anything"""
363
363
        target = self.make_branch_and_tree('target')
364
364
        out = self.run_bzr('pull -v source -d target')[0]
365
365
        self.assertContainsRe(out,
366
 
                              br'revno: 1\ncommitter: .*\nbranch nick: source')
367
 
        self.assertNotContainsRe(out, br'\n {4}1 .*\n {6}setup\n')
 
366
                              r'revno: 1\ncommitter: .*\nbranch nick: source')
 
367
        self.assertNotContainsRe(out, r'\n {4}1 .*\n {6}setup\n')
368
368
 
369
369
    def test_pull_verbose_uses_default_log(self):
370
370
        tree = self.example_branch('source')
371
371
        target = self.make_branch_and_tree('target')
372
372
        target.branch.get_config_stack().set('log_format', 'short')
373
373
        out = self.run_bzr('pull -v source -d target')[0]
374
 
        self.assertContainsRe(out, br'\n {4}1 .*\n {6}setup\n')
 
374
        self.assertContainsRe(out, r'\n {4}1 .*\n {6}setup\n')
375
375
        self.assertNotContainsRe(
376
 
            out, br'revno: 1\ncommitter: .*\nbranch nick: source')
 
376
            out, r'revno: 1\ncommitter: .*\nbranch nick: source')
377
377
 
378
378
    def test_pull_smart_bound_branch(self):
379
379
        self.setup_smart_server_with_call_log()
425
425
        from_tree.commit(message='first commit')
426
426
        out, err = self.run_bzr(['pull', '-d', 'to', 'from'])
427
427
        self.assertContainsRe(err,
428
 
            b"(?m)Doing on-the-fly conversion")
 
428
            "(?m)Doing on-the-fly conversion")
429
429
 
430
430
    def test_pull_cross_format_warning_no_IDS(self):
431
431
        """You get a warning for probably slow cross-format pulls.
441
441
        from_tree.commit(message='first commit')
442
442
        out, err = self.run_bzr(['pull', '-d', 'to', 'from'])
443
443
        self.assertContainsRe(err,
444
 
            b"(?m)Doing on-the-fly conversion")
 
444
            "(?m)Doing on-the-fly conversion")
445
445
 
446
446
    def test_pull_cross_format_from_network(self):
447
447
        self.setup_smart_server_with_call_log()
452
452
        out, err = self.run_bzr(['pull', '-d', 'to',
453
453
            from_tree.branch.controldir.root_transport.base])
454
454
        self.assertContainsRe(err,
455
 
            b"(?m)Doing on-the-fly conversion")
 
455
            "(?m)Doing on-the-fly conversion")
456
456
 
457
457
    def test_pull_to_experimental_format_warning(self):
458
458
        """You get a warning for pulling into experimental formats.
462
462
        from_tree.commit(message='first commit')
463
463
        out, err = self.run_bzr(['pull', '-d', 'to', 'from'])
464
464
        self.assertContainsRe(err,
465
 
            b"(?m)Fetching into experimental format")
 
465
            "(?m)Fetching into experimental format")
466
466
 
467
467
    def test_pull_cross_to_experimental_format_warning(self):
468
468
        """You get a warning for pulling into experimental formats.
472
472
        from_tree.commit(message='first commit')
473
473
        out, err = self.run_bzr(['pull', '-d', 'to', 'from'])
474
474
        self.assertContainsRe(err,
475
 
            b"(?m)Fetching into experimental format")
 
475
            "(?m)Fetching into experimental format")
476
476
 
477
477
    def test_pull_show_base(self):
478
478
        """brz pull supports --show-base