← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: Vincent Ladeuil
  • Date: 2007-05-25 16:39:29 UTC
  • mto: (2485.8.44 bzr.connection.sharing)
  • mto: This revision was merged to the branch mainline in revision 2646.
  • Revision ID: v.ladeuil+lp@free.fr-20070525163929-l6x2jv17ogc9q7s4
Add test for init-repository and merge.

* bzrlib/tests/commands/__init__.py:
(test_suite): Add test_init_repository and test_merge.

* bzrlib/tests/commands/test_merge.py: 
New file.

* bzrlib/tests/commands/test_init_repository.py: 
New file.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/commands/test_merge.py
 
1
# Copyright (C) 2007 Canonical Ltd
 
2
#
 
3
# This program is free software; you can redistribute it and/or modify
 
4
# it under the terms of the GNU General Public License as published by
 
5
# the Free Software Foundation; either version 2 of the License, or
 
6
# (at your option) any later version.
 
7
#
 
8
# This program is distributed in the hope that it will be useful,
 
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
 
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 
11
# GNU General Public License for more details.
 
12
#
 
13
# You should have received a copy of the GNU General Public License
 
14
# along with this program; if not, write to the Free Software
 
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
16
 
 
17
 
 
18
from bzrlib.builtins import cmd_merge
 
19
from bzrlib.tests import StringIOWrapper
 
20
from bzrlib.tests.TransportUtil import TestCaseWithConnectionHookedTransport
 
21
 
 
22
class TestMerge(TestCaseWithConnectionHookedTransport):
 
23
 
 
24
    def test_merge(self):
 
25
        wt1 = self.make_branch_and_tree('branch1')
 
26
        wt1.commit('empty commit')
 
27
        wt2 = self.make_branch_and_tree('branch2')
 
28
        wt2.pull(wt1.branch)
 
29
        wt2.commit('empty commit too')
 
30
 
 
31
        cmd = cmd_merge()
 
32
        # We don't care about the ouput but 'outf' should be defined
 
33
        cmd.outf = StringIOWrapper()
 
34
        cmd.run(self.get_url() + '/branch1', directory='branch2')
 
35
        self.assertEquals(1, len(self.connections))
 
36