/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: Robert Collins
  • Date: 2010-05-06 23:41:35 UTC
  • mto: This revision was merged to the branch mainline in revision 5223.
  • Revision ID: robertc@robertcollins.net-20100506234135-yivbzczw1sejxnxc
Lock methods on ``Tree``, ``Branch`` and ``Repository`` are now
expected to return an object which can be used to unlock them. This reduces
duplicate code when using cleanups. The previous 'tokens's returned by
``Branch.lock_write`` and ``Repository.lock_write`` are now attributes
on the result of the lock_write. ``repository.RepositoryWriteLockResult``
and ``branch.BranchWriteLockResult`` document this. (Robert Collins)

``log._get_info_for_log_files`` now takes an add_cleanup callable.
(Robert Collins)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/commands/test_commit.py
1
 
# Copyright (C) 2007-2010, 2016 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
15
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
16
16
 
17
17
import os
18
 
from breezy import (
 
18
from bzrlib import (
19
19
    branch,
20
20
    builtins,
21
21
    errors,
22
22
    )
23
 
from breezy.tests import transport_util
 
23
from bzrlib.tests import transport_util
24
24
 
25
25
 
26
26
class TestCommitWithBoundBranch(
27
 
        transport_util.TestCaseWithConnectionHookedTransport):
 
27
    transport_util.TestCaseWithConnectionHookedTransport):
28
28
 
29
29
    def setUp(self):
30
30
        super(TestCommitWithBoundBranch, self).setUp()
43
43
        # manually
44
44
        os.chdir('local')
45
45
        commit.run(message=u'empty commit', unchanged=True)
46
 
        self.assertEqual(1, len(self.connections))
 
46
        self.assertEquals(1, len(self.connections))
47
47
 
48
48
    def test_commit_both_modified(self):
49
49
        self.master_wt.commit('empty commit on master')
55
55
        os.chdir('local')
56
56
        self.assertRaises(errors.BoundBranchOutOfDate, commit.run,
57
57
                          message=u'empty commit', unchanged=True)
58
 
        self.assertEqual(1, len(self.connections))
 
58
        self.assertEquals(1, len(self.connections))
59
59
 
60
60
    def test_commit_local(self):
61
61
        """Commits with --local should not connect to the master!"""
67
67
        os.chdir('local')
68
68
        commit.run(message=u'empty commit', unchanged=True, local=True)
69
69
 
70
 
        # it shouldn't open any connections
71
 
        self.assertEqual(0, len(self.connections))
 
70
        #it shouldn't open any connections
 
71
        self.assertEquals(0, len(self.connections))