5557.1.7
by John Arbash Meinel
Merge in the bzr.dev 5582 |
1 |
# Copyright (C) 2009, 2010, 2011 Canonical Ltd
|
3920.2.7
by Jelmer Vernooij
Add comments about dummy vcs. |
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
|
|
3920.2.28
by Jelmer Vernooij
Fix FSF address. |
15 |
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
3920.2.7
by Jelmer Vernooij
Add comments about dummy vcs. |
16 |
|
3920.2.36
by Jelmer Vernooij
Fix tests after CommitBuilder changes. |
17 |
|
3920.2.7
by Jelmer Vernooij
Add comments about dummy vcs. |
18 |
"""Black-box tests for bzr dpush."""
|
19 |
||
3920.2.36
by Jelmer Vernooij
Fix tests after CommitBuilder changes. |
20 |
|
3920.2.30
by Jelmer Vernooij
Review from John. |
21 |
import os |
22 |
||
4721.2.1
by Vincent Ladeuil
Some test cleamup. |
23 |
from bzrlib import ( |
24 |
branch, |
|
25 |
bzrdir, |
|
26 |
foreign, |
|
27 |
tests, |
|
4721.2.2
by Vincent Ladeuil
Start testing and implementing --strict for dpush. |
28 |
workingtree, |
3920.2.36
by Jelmer Vernooij
Fix tests after CommitBuilder changes. |
29 |
)
|
4721.2.1
by Vincent Ladeuil
Some test cleamup. |
30 |
from bzrlib.tests import ( |
31 |
blackbox, |
|
5283.4.1
by Martin Pool
Deprecate ExternalBase.check_output and update some callers to use scripts |
32 |
script, |
4721.2.1
by Vincent Ladeuil
Some test cleamup. |
33 |
test_foreign, |
34 |
)
|
|
4721.2.6
by Vincent Ladeuil
More agressive test sharing between push and dpush. |
35 |
from bzrlib.tests.blackbox import test_push |
5559.2.2
by Martin Pool
Change to using standard load_tests_apply_scenarios. |
36 |
from bzrlib.tests.scenarios import ( |
37 |
load_tests_apply_scenarios, |
|
38 |
)
|
|
39 |
||
40 |
||
41 |
load_tests = load_tests_apply_scenarios |
|
4721.2.2
by Vincent Ladeuil
Start testing and implementing --strict for dpush. |
42 |
|
43 |
||
5283.4.1
by Martin Pool
Deprecate ExternalBase.check_output and update some callers to use scripts |
44 |
class TestDpush(tests.TestCaseWithTransport): |
3920.2.10
by Jelmer Vernooij
More work trying to implement a dummy version control system. |
45 |
|
46 |
def setUp(self): |
|
47 |
super(TestDpush, self).setUp() |
|
4721.2.5
by Vincent Ladeuil
Some refactoring. |
48 |
test_foreign.register_dummy_foreign_for_test(self) |
3920.2.10
by Jelmer Vernooij
More work trying to implement a dummy version control system. |
49 |
|
3920.2.33
by Jelmer Vernooij
Use branch_builder to create revisions in testsuite. |
50 |
def make_dummy_builder(self, relpath): |
4721.2.1
by Vincent Ladeuil
Some test cleamup. |
51 |
builder = self.make_branch_builder( |
52 |
relpath, format=test_foreign.DummyForeignVcsDirFormat()) |
|
53 |
builder.build_snapshot('revid', None, |
|
3920.2.33
by Jelmer Vernooij
Use branch_builder to create revisions in testsuite. |
54 |
[('add', ('', 'TREE_ROOT', 'directory', None)), |
55 |
('add', ('foo', 'fooid', 'file', 'bar'))]) |
|
56 |
return builder |
|
57 |
||
3920.2.18
by Jelmer Vernooij
make sure dpush between native branches fails. |
58 |
def test_dpush_native(self): |
3920.2.30
by Jelmer Vernooij
Review from John. |
59 |
target_tree = self.make_branch_and_tree("dp") |
60 |
source_tree = self.make_branch_and_tree("dc") |
|
3920.2.36
by Jelmer Vernooij
Fix tests after CommitBuilder changes. |
61 |
output, error = self.run_bzr("dpush -d dc dp", retcode=3) |
62 |
self.assertEquals("", output) |
|
4368.2.2
by Jelmer Vernooij
s/not possible/not necessary/. |
63 |
self.assertContainsRe(error, 'in the same VCS, lossy push not necessary. Please use regular push.') |
3920.2.18
by Jelmer Vernooij
make sure dpush between native branches fails. |
64 |
|
3920.2.10
by Jelmer Vernooij
More work trying to implement a dummy version control system. |
65 |
def test_dpush(self): |
3920.2.33
by Jelmer Vernooij
Use branch_builder to create revisions in testsuite. |
66 |
branch = self.make_dummy_builder('d').get_branch() |
3920.2.10
by Jelmer Vernooij
More work trying to implement a dummy version control system. |
67 |
|
3920.2.33
by Jelmer Vernooij
Use branch_builder to create revisions in testsuite. |
68 |
dc = branch.bzrdir.sprout('dc', force_new_repo=True) |
3920.2.10
by Jelmer Vernooij
More work trying to implement a dummy version control system. |
69 |
self.build_tree(("dc/foo", "blaaaa")) |
3920.2.32
by Jelmer Vernooij
Avoid run_bzr for functions other than the one being tested. |
70 |
dc.open_workingtree().commit('msg') |
71 |
||
5283.4.1
by Martin Pool
Deprecate ExternalBase.check_output and update some callers to use scripts |
72 |
script.run_script(self, """ |
73 |
$ bzr dpush -d dc d
|
|
74 |
2>Pushed up to revision 2.
|
|
75 |
$ bzr status dc
|
|
76 |
""") |
|
3920.2.10
by Jelmer Vernooij
More work trying to implement a dummy version control system. |
77 |
|
78 |
def test_dpush_new(self): |
|
4721.2.1
by Vincent Ladeuil
Some test cleamup. |
79 |
b = self.make_dummy_builder('d').get_branch() |
3920.2.33
by Jelmer Vernooij
Use branch_builder to create revisions in testsuite. |
80 |
|
4721.2.1
by Vincent Ladeuil
Some test cleamup. |
81 |
dc = b.bzrdir.sprout('dc', force_new_repo=True) |
3920.2.36
by Jelmer Vernooij
Fix tests after CommitBuilder changes. |
82 |
self.build_tree_contents([("dc/foofile", "blaaaa")]) |
3920.2.32
by Jelmer Vernooij
Avoid run_bzr for functions other than the one being tested. |
83 |
dc_tree = dc.open_workingtree() |
3920.2.33
by Jelmer Vernooij
Use branch_builder to create revisions in testsuite. |
84 |
dc_tree.add("foofile") |
85 |
dc_tree.commit("msg") |
|
3920.2.32
by Jelmer Vernooij
Avoid run_bzr for functions other than the one being tested. |
86 |
|
5283.4.1
by Martin Pool
Deprecate ExternalBase.check_output and update some callers to use scripts |
87 |
script.run_script(self, ''' |
88 |
$ bzr dpush -d dc d
|
|
5422.3.2
by Martin Pool
Update existing script tests to not ignore their output |
89 |
2>Pushed up to revision 2.
|
5283.4.1
by Martin Pool
Deprecate ExternalBase.check_output and update some callers to use scripts |
90 |
$ bzr revno dc
|
91 |
2
|
|
92 |
$ bzr status dc
|
|
93 |
''') |
|
3920.2.10
by Jelmer Vernooij
More work trying to implement a dummy version control system. |
94 |
|
95 |
def test_dpush_wt_diff(self): |
|
4721.2.1
by Vincent Ladeuil
Some test cleamup. |
96 |
b = self.make_dummy_builder('d').get_branch() |
3920.2.10
by Jelmer Vernooij
More work trying to implement a dummy version control system. |
97 |
|
4721.2.1
by Vincent Ladeuil
Some test cleamup. |
98 |
dc = b.bzrdir.sprout('dc', force_new_repo=True) |
3920.2.20
by Jelmer Vernooij
Fix dpush tests. |
99 |
self.build_tree_contents([("dc/foofile", "blaaaa")]) |
3920.2.32
by Jelmer Vernooij
Avoid run_bzr for functions other than the one being tested. |
100 |
dc_tree = dc.open_workingtree() |
3920.2.33
by Jelmer Vernooij
Use branch_builder to create revisions in testsuite. |
101 |
dc_tree.add("foofile") |
102 |
newrevid = dc_tree.commit('msg') |
|
3920.2.32
by Jelmer Vernooij
Avoid run_bzr for functions other than the one being tested. |
103 |
|
3920.2.20
by Jelmer Vernooij
Fix dpush tests. |
104 |
self.build_tree_contents([("dc/foofile", "blaaaal")]) |
5283.4.1
by Martin Pool
Deprecate ExternalBase.check_output and update some callers to use scripts |
105 |
script.run_script(self, ''' |
106 |
$ bzr dpush -d dc d --no-strict
|
|
5422.3.2
by Martin Pool
Update existing script tests to not ignore their output |
107 |
2>Pushed up to revision 2.
|
5283.4.1
by Martin Pool
Deprecate ExternalBase.check_output and update some callers to use scripts |
108 |
''') |
3920.2.20
by Jelmer Vernooij
Fix dpush tests. |
109 |
self.assertFileEqual("blaaaal", "dc/foofile") |
4721.2.3
by Vincent Ladeuil
Make all test pass by implement --strict for dpush. |
110 |
# if the dummy vcs wasn't that dummy we could uncomment the line below
|
111 |
# self.assertFileEqual("blaaaa", "d/foofile")
|
|
5283.4.1
by Martin Pool
Deprecate ExternalBase.check_output and update some callers to use scripts |
112 |
script.run_script(self, ''' |
113 |
$ bzr status dc
|
|
114 |
modified:
|
|
115 |
foofile
|
|
116 |
''') |
|
3920.2.20
by Jelmer Vernooij
Fix dpush tests. |
117 |
|
118 |
def test_diverged(self): |
|
3920.2.33
by Jelmer Vernooij
Use branch_builder to create revisions in testsuite. |
119 |
builder = self.make_dummy_builder('d') |
120 |
||
4721.2.1
by Vincent Ladeuil
Some test cleamup. |
121 |
b = builder.get_branch() |
3920.2.33
by Jelmer Vernooij
Use branch_builder to create revisions in testsuite. |
122 |
|
4721.2.1
by Vincent Ladeuil
Some test cleamup. |
123 |
dc = b.bzrdir.sprout('dc', force_new_repo=True) |
3920.2.32
by Jelmer Vernooij
Avoid run_bzr for functions other than the one being tested. |
124 |
dc_tree = dc.open_workingtree() |
3920.2.20
by Jelmer Vernooij
Fix dpush tests. |
125 |
|
126 |
self.build_tree_contents([("dc/foo", "bar")]) |
|
3920.2.33
by Jelmer Vernooij
Use branch_builder to create revisions in testsuite. |
127 |
dc_tree.commit('msg1') |
3920.2.20
by Jelmer Vernooij
Fix dpush tests. |
128 |
|
3920.2.33
by Jelmer Vernooij
Use branch_builder to create revisions in testsuite. |
129 |
builder.build_snapshot('revid2', None, |
130 |
[('modify', ('fooid', 'blie'))]) |
|
3920.2.20
by Jelmer Vernooij
Fix dpush tests. |
131 |
|
3920.2.36
by Jelmer Vernooij
Fix tests after CommitBuilder changes. |
132 |
output, error = self.run_bzr("dpush -d dc d", retcode=3) |
133 |
self.assertEquals(output, "") |
|
3920.2.20
by Jelmer Vernooij
Fix dpush tests. |
134 |
self.assertContainsRe(error, "have diverged") |
4721.2.2
by Vincent Ladeuil
Start testing and implementing --strict for dpush. |
135 |
|
136 |
||
137 |
class TestDpushStrictMixin(object): |
|
138 |
||
4721.2.7
by Vincent Ladeuil
Final tweak. |
139 |
def setUp(self): |
140 |
test_foreign.register_dummy_foreign_for_test(self) |
|
4721.2.2
by Vincent Ladeuil
Start testing and implementing --strict for dpush. |
141 |
# Create an empty branch where we will be able to push
|
142 |
self.foreign = self.make_branch( |
|
4721.2.7
by Vincent Ladeuil
Final tweak. |
143 |
'to', format=test_foreign.DummyForeignVcsDirFormat()) |
4721.2.2
by Vincent Ladeuil
Start testing and implementing --strict for dpush. |
144 |
|
4721.2.6
by Vincent Ladeuil
More agressive test sharing between push and dpush. |
145 |
def set_config_push_strict(self, value): |
4721.2.2
by Vincent Ladeuil
Start testing and implementing --strict for dpush. |
146 |
# set config var (any of bazaar.conf, locations.conf, branch.conf
|
147 |
# should do)
|
|
148 |
conf = self.tree.branch.get_config() |
|
149 |
conf.set_user_option('dpush_strict', value) |
|
150 |
||
151 |
_default_command = ['dpush', '../to'] |
|
152 |
||
153 |
||
4721.2.6
by Vincent Ladeuil
More agressive test sharing between push and dpush. |
154 |
class TestDpushStrictWithoutChanges(TestDpushStrictMixin, |
155 |
test_push.TestPushStrictWithoutChanges): |
|
4721.2.2
by Vincent Ladeuil
Start testing and implementing --strict for dpush. |
156 |
|
157 |
def setUp(self): |
|
4721.2.7
by Vincent Ladeuil
Final tweak. |
158 |
test_push.TestPushStrictWithoutChanges.setUp(self) |
159 |
TestDpushStrictMixin.setUp(self) |
|
4721.2.2
by Vincent Ladeuil
Start testing and implementing --strict for dpush. |
160 |
|
4721.2.6
by Vincent Ladeuil
More agressive test sharing between push and dpush. |
161 |
|
162 |
class TestDpushStrictWithChanges(TestDpushStrictMixin, |
|
163 |
test_push.TestPushStrictWithChanges): |
|
4721.2.2
by Vincent Ladeuil
Start testing and implementing --strict for dpush. |
164 |
|
5559.2.2
by Martin Pool
Change to using standard load_tests_apply_scenarios. |
165 |
scenarios = test_push.strict_push_change_scenarios |
166 |
||
4721.2.2
by Vincent Ladeuil
Start testing and implementing --strict for dpush. |
167 |
_changes_type = None # Set by load_tests |
168 |
||
169 |
def setUp(self): |
|
4721.2.7
by Vincent Ladeuil
Final tweak. |
170 |
test_push.TestPushStrictWithChanges.setUp(self) |
171 |
TestDpushStrictMixin.setUp(self) |
|
4721.2.2
by Vincent Ladeuil
Start testing and implementing --strict for dpush. |
172 |
|
4721.2.6
by Vincent Ladeuil
More agressive test sharing between push and dpush. |
173 |
def test_push_with_revision(self): |
174 |
raise tests.TestNotApplicable('dpush does not handle --revision') |