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

  • Committer: Breezy landing bot
  • Author(s): Colin Watson
  • Date: 2020-11-16 21:47:08 UTC
  • mfrom: (7521.1.1 remove-lp-workaround)
  • Revision ID: breezy.the.bot@gmail.com-20201116214708-jos209mgxi41oy15
Remove breezy.git workaround for bazaar.launchpad.net.

Merged from https://code.launchpad.net/~cjwatson/brz/remove-lp-workaround/+merge/393710

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/blackbox/test_remerge.py
17
17
 
18
18
import os
19
19
 
20
 
from bzrlib.tests import TestCaseWithTransport
21
 
from bzrlib.workingtree import WorkingTree
 
20
from breezy.tests import TestCaseWithTransport
 
21
from breezy.workingtree import WorkingTree
22
22
 
23
23
 
24
24
class TestRemerge(TestCaseWithTransport):
25
25
 
26
26
    def make_file(self, name, contents):
27
 
        with open(name, 'wb') as f:
 
27
        with open(name, 'w') as f:
28
28
            f.write(contents)
29
29
 
30
30
    def create_conflicts(self):
66
66
        os.unlink('this/question.OTHER')
67
67
 
68
68
        self.run_bzr_error(['jello is not versioned'],
69
 
                     'remerge jello --merge-type weave', working_dir='this')
 
69
                           'remerge jello --merge-type weave', working_dir='this')
70
70
        self.run_bzr_error(['conflicts encountered'],
71
71
                           'remerge hello --merge-type weave',
72
72
                           retcode=1, working_dir='this')