|
4763.2.4
by John Arbash Meinel
merge bzr.2.1 in preparation for NEWS entry. |
1 |
# Copyright (C) 2007-2010 Canonical Ltd
|
|
2817.4.3
by Vincent Ladeuil
Add tests for commit, reuse master branch transport. |
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
|
|
|
4183.7.1
by Sabin Iacob
update FSF mailing address |
15 |
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
|
2817.4.3
by Vincent Ladeuil
Add tests for commit, reuse master branch transport. |
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') |
|
|
5141.2.1
by Robert Collins
``bzrlib.commands.Command.run_direct`` is no longer needed - the pre |
45 |
commit.run(message=u'empty commit', unchanged=True) |
|
2817.4.3
by Vincent Ladeuil
Add tests for commit, reuse master branch transport. |
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') |
|
|
5066.1.1
by Gary van der Merwe
Make it possible to detect a BoundBranchOutOfDate from commit. |
56 |
self.assertRaises(errors.BoundBranchOutOfDate, commit.run, |
|
2817.4.3
by Vincent Ladeuil
Add tests for commit, reuse master branch transport. |
57 |
message=u'empty commit', unchanged=True) |
58 |
self.assertEquals(1, len(self.connections)) |
|
59 |
||
|
3815.3.4
by Marius Kruger
When doing a `commit --local`, don't try to connect to the master branch. |
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)) |