/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 bzrlib/tests/commands/test_commit.py

  • Committer: John Arbash Meinel
  • Date: 2009-06-18 18:18:36 UTC
  • mto: This revision was merged to the branch mainline in revision 4461.
  • Revision ID: john@arbash-meinel.com-20090618181836-biodfkat9a8eyzjz
The new add_inventory_by_delta is returning a CHKInventory when mapping from NULL
Which is completely valid, but 'broke' one of the tests.
So to fix it, changed the test to use CHKInventories on both sides, and add an __eq__
member. The nice thing is that CHKInventory.__eq__ is fairly cheap, since it only
has to check the root keys.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/commands/test_commit.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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
16
 
 
17
import os
 
18
from bzrlib import (
 
19
    branch,
 
20
    builtins,
 
21
    errors,
 
22
    )
 
23
from bzrlib.tests import transport_util
 
24
 
 
25
 
 
26
class TestCommitWithBoundBranch(
 
27
    transport_util.TestCaseWithConnectionHookedTransport):
 
28
 
 
29
    def setUp(self):
 
30
        super(TestCommitWithBoundBranch, self).setUp()
 
31
        self.master_wt = self.make_branch_and_tree('master')
 
32
        self.local_wt = self.make_branch_and_tree('local')
 
33
 
 
34
        master_branch = branch.Branch.open(self.get_url('master'))
 
35
        self.local_wt.branch.bind(master_branch)
 
36
 
 
37
    def test_commit_mine_modified(self):
 
38
 
 
39
        self.start_logging_connections()
 
40
 
 
41
        commit = builtins.cmd_commit()
 
42
        # commit do not provide a directory parameter, we have to change dir
 
43
        # manually
 
44
        os.chdir('local')
 
45
        commit.run(message=u'empty commit', unchanged=True)
 
46
        self.assertEquals(1, len(self.connections))
 
47
 
 
48
    def test_commit_both_modified(self):
 
49
        self.master_wt.commit('empty commit on master')
 
50
        self.start_logging_connections()
 
51
 
 
52
        commit = builtins.cmd_commit()
 
53
        # commit do not provide a directory parameter, we have to change dir
 
54
        # manually
 
55
        os.chdir('local')
 
56
        # cmd_commit translates BoundBranchOutOfDate into BzrCommandError
 
57
        self.assertRaises(errors.BzrCommandError, commit.run,
 
58
                          message=u'empty commit', unchanged=True)
 
59
        self.assertEquals(1, len(self.connections))
 
60
 
 
61
    def test_commit_local(self):
 
62
        """Commits with --local should not connect to the master!"""
 
63
        self.start_logging_connections()
 
64
 
 
65
        commit = builtins.cmd_commit()
 
66
        # commit do not provide a directory parameter, we have to change dir
 
67
        # manually
 
68
        os.chdir('local')
 
69
        commit.run(message=u'empty commit', unchanged=True, local=True)
 
70
 
 
71
        #it shouldn't open any connections
 
72
        self.assertEquals(0, len(self.connections))