1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
|
# Copyright (C) 2009, 2010 Canonical Ltd
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
"""Black-box tests for bzr dpush."""
import os
from bzrlib import (
branch,
bzrdir,
foreign,
tests,
workingtree,
)
from bzrlib.tests import (
blackbox,
test_foreign,
)
from bzrlib.tests.blackbox import test_push
def load_tests(standard_tests, module, loader):
"""Multiply tests for the dpush command."""
result = loader.suiteClass()
# one for each king of change
changes_tests, remaining_tests = tests.split_suite_by_condition(
standard_tests, tests.condition_isinstance((
TestDpushStrictWithChanges,
)))
changes_scenarios = [
('uncommitted',
dict(_changes_type= '_uncommitted_changes')),
('pending-merges',
dict(_changes_type= '_pending_merges')),
('out-of-sync-trees',
dict(_changes_type= '_out_of_sync_trees')),
]
tests.multiply_tests(changes_tests, changes_scenarios, result)
# No parametrization for the remaining tests
result.addTests(remaining_tests)
return result
class TestDpush(blackbox.ExternalBase):
def setUp(self):
super(TestDpush, self).setUp()
test_foreign.register_dummy_foreign_for_test(self)
def make_dummy_builder(self, relpath):
builder = self.make_branch_builder(
relpath, format=test_foreign.DummyForeignVcsDirFormat())
builder.build_snapshot('revid', None,
[('add', ('', 'TREE_ROOT', 'directory', None)),
('add', ('foo', 'fooid', 'file', 'bar'))])
return builder
def test_dpush_native(self):
target_tree = self.make_branch_and_tree("dp")
source_tree = self.make_branch_and_tree("dc")
output, error = self.run_bzr("dpush -d dc dp", retcode=3)
self.assertEquals("", output)
self.assertContainsRe(error, 'in the same VCS, lossy push not necessary. Please use regular push.')
def test_dpush(self):
branch = self.make_dummy_builder('d').get_branch()
dc = branch.bzrdir.sprout('dc', force_new_repo=True)
self.build_tree(("dc/foo", "blaaaa"))
dc.open_workingtree().commit('msg')
output, error = self.run_bzr("dpush -d dc d")
self.assertEquals(error, "Pushed up to revision 2.\n")
self.check_output("", "status dc")
def test_dpush_new(self):
b = self.make_dummy_builder('d').get_branch()
dc = b.bzrdir.sprout('dc', force_new_repo=True)
self.build_tree_contents([("dc/foofile", "blaaaa")])
dc_tree = dc.open_workingtree()
dc_tree.add("foofile")
dc_tree.commit("msg")
self.check_output("", "dpush -d dc d")
self.check_output("2\n", "revno dc")
self.check_output("", "status dc")
def test_dpush_wt_diff(self):
b = self.make_dummy_builder('d').get_branch()
dc = b.bzrdir.sprout('dc', force_new_repo=True)
self.build_tree_contents([("dc/foofile", "blaaaa")])
dc_tree = dc.open_workingtree()
dc_tree.add("foofile")
newrevid = dc_tree.commit('msg')
self.build_tree_contents([("dc/foofile", "blaaaal")])
self.check_output("", "dpush -d dc d --no-strict")
self.assertFileEqual("blaaaal", "dc/foofile")
# if the dummy vcs wasn't that dummy we could uncomment the line below
# self.assertFileEqual("blaaaa", "d/foofile")
self.check_output('modified:\n foofile\n', "status dc")
def test_diverged(self):
builder = self.make_dummy_builder('d')
b = builder.get_branch()
dc = b.bzrdir.sprout('dc', force_new_repo=True)
dc_tree = dc.open_workingtree()
self.build_tree_contents([("dc/foo", "bar")])
dc_tree.commit('msg1')
builder.build_snapshot('revid2', None,
[('modify', ('fooid', 'blie'))])
output, error = self.run_bzr("dpush -d dc d", retcode=3)
self.assertEquals(output, "")
self.assertContainsRe(error, "have diverged")
class TestDpushStrictMixin(object):
def setUp(self):
test_foreign.register_dummy_foreign_for_test(self)
# Create an empty branch where we will be able to push
self.foreign = self.make_branch(
'to', format=test_foreign.DummyForeignVcsDirFormat())
def set_config_push_strict(self, value):
# set config var (any of bazaar.conf, locations.conf, branch.conf
# should do)
conf = self.tree.branch.get_config()
conf.set_user_option('dpush_strict', value)
_default_command = ['dpush', '../to']
_default_pushed_revid = False # Doesn't aplly for dpush
def assertPushSucceeds(self, args, pushed_revid=None, with_warning=False):
if with_warning:
error_regexes = self._default_errors
else:
error_regexes = []
self.run_bzr(self._default_command + args,
working_dir=self._default_wd, error_regexes=error_regexes)
if pushed_revid is None:
# dpush change the revids, so we need to get back to it
branch_from = branch.Branch.open(self._default_wd)
pushed_revid = branch_from.last_revision()
branch_to = branch.Branch.open('to')
repo_to = branch_to.repository
self.assertTrue(repo_to.has_revision(pushed_revid))
self.assertEqual(branch_to.last_revision(), pushed_revid)
class TestDpushStrictWithoutChanges(TestDpushStrictMixin,
test_push.TestPushStrictWithoutChanges):
def setUp(self):
test_push.TestPushStrictWithoutChanges.setUp(self)
TestDpushStrictMixin.setUp(self)
class TestDpushStrictWithChanges(TestDpushStrictMixin,
test_push.TestPushStrictWithChanges):
_changes_type = None # Set by load_tests
def setUp(self):
test_push.TestPushStrictWithChanges.setUp(self)
TestDpushStrictMixin.setUp(self)
def test_push_with_revision(self):
raise tests.TestNotApplicable('dpush does not handle --revision')
|