/breezy/unstable

To get this branch, use:
bzr branch https://code.breezy-vcs.org/breezy/unstable

« back to all changes in this revision

Viewing changes to breezy/tests/commands/test_merge.py

  • Committer: Jelmer Vernooij
  • Date: 2017-05-24 01:39:33 UTC
  • mfrom: (3815.3776.6)
  • Revision ID: jelmer@jelmer.uk-20170524013933-ir4y4tqtrsiz2ka2
New upstream snapshot.

Show diffs side-by-side

added added

removed removed

Lines of Context:
14
14
# along with this program; if not, write to the Free Software
15
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
16
16
 
17
 
 
18
 
from bzrlib.builtins import cmd_merge
19
 
from bzrlib.tests import StringIOWrapper
20
 
from bzrlib.tests.transport_util import TestCaseWithConnectionHookedTransport
21
 
 
22
 
 
23
 
class TestMerge(TestCaseWithConnectionHookedTransport):
 
17
from ...builtins import cmd_merge
 
18
from .. import (
 
19
    transport_util,
 
20
    ui_testing,
 
21
    )
 
22
 
 
23
 
 
24
class TestMerge(transport_util.TestCaseWithConnectionHookedTransport):
24
25
 
25
26
    def test_merge(self):
26
27
        wt1 = self.make_branch_and_tree('branch1')
32
33
        self.start_logging_connections()
33
34
 
34
35
        cmd = cmd_merge()
35
 
        # We don't care about the ouput but 'outf' should be defined
36
 
        cmd.outf = StringIOWrapper()
 
36
        cmd.outf = ui_testing.StringIOWithEncoding()
37
37
        cmd.run(self.get_url('branch1'), directory='branch2')
38
38
        self.assertEqual(1, len(self.connections))