← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: Robert Collins
  • Date: 2010-04-08 04:34:03 UTC
  • mfrom: (5138 +trunk)
  • mto: This revision was merged to the branch mainline in revision 5139.
  • Revision ID: robertc@robertcollins.net-20100408043403-56z0d07vdqrx7f3t
Update bugfix for 528114 to trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/commands/test_commit.py
1
 
# Copyright (C) 2007 Canonical Ltd
 
1
# Copyright (C) 2007-2010 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
12
12
#
13
13
# You should have received a copy of the GNU General Public License
14
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
 
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
16
16
 
17
17
import os
18
18
from bzrlib import (
42
42
        # commit do not provide a directory parameter, we have to change dir
43
43
        # manually
44
44
        os.chdir('local')
45
 
        commit.run(message=u'empty commit', unchanged=True)
 
45
        commit.run_direct(message=u'empty commit', unchanged=True)
46
46
        self.assertEquals(1, len(self.connections))
47
47
 
48
48
    def test_commit_both_modified(self):
53
53
        # commit do not provide a directory parameter, we have to change dir
54
54
        # manually
55
55
        os.chdir('local')
56
 
        # cmd_commit translates BoundBranchOutOfDate into BzrCommandError
57
 
        self.assertRaises(errors.BzrCommandError, commit.run,
 
56
        self.assertRaises(errors.BoundBranchOutOfDate, commit.run,
58
57
                          message=u'empty commit', unchanged=True)
59
58
        self.assertEquals(1, len(self.connections))
60
59
 
 
60
    def test_commit_local(self):
 
61
        """Commits with --local should not connect to the master!"""
 
62
        self.start_logging_connections()
 
63
 
 
64
        commit = builtins.cmd_commit()
 
65
        # commit do not provide a directory parameter, we have to change dir
 
66
        # manually
 
67
        os.chdir('local')
 
68
        commit.run(message=u'empty commit', unchanged=True, local=True)
 
69
 
 
70
        #it shouldn't open any connections
 
71
        self.assertEquals(0, len(self.connections))