1
# Copyright (C) 2009-2012, 2016 Canonical Ltd
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.
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.
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
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
18
"""Black-box tests for brz dpush."""
25
from breezy.tests import (
29
from breezy.tests.blackbox import test_push
30
from breezy.tests.scenarios import (
31
load_tests_apply_scenarios,
35
load_tests = load_tests_apply_scenarios
38
class TestDpush(tests.TestCaseWithTransport):
41
super(TestDpush, self).setUp()
42
test_foreign.register_dummy_foreign_for_test(self)
44
def make_dummy_builder(self, relpath):
45
builder = self.make_branch_builder(
46
relpath, format=test_foreign.DummyForeignVcsDirFormat())
47
builder.build_snapshot(None,
48
[('add', ('', 'TREE_ROOT', 'directory', None)),
49
('add', ('foo', 'fooid', 'file', 'bar'))],
53
def test_dpush_native(self):
54
target_tree = self.make_branch_and_tree("dp")
55
source_tree = self.make_branch_and_tree("dc")
56
output, error = self.run_bzr("dpush -d dc dp", retcode=3)
57
self.assertEqual("", output)
58
self.assertContainsRe(error,
59
'in the same VCS, lossy push not necessary. Please use regular '
63
branch = self.make_dummy_builder('d').get_branch()
65
dc = branch.controldir.sprout('dc', force_new_repo=True)
66
self.build_tree(("dc/foo", "blaaaa"))
67
dc.open_workingtree().commit('msg')
69
script.run_script(self, """
71
2>Doing on-the-fly conversion from DummyForeignVcsRepositoryFormat() to RepositoryFormat2a().
72
2>This may take some time. Upgrade the repositories to the same format for better performance.
73
2>Pushed up to revision 2.
77
def test_dpush_new(self):
78
b = self.make_dummy_builder('d').get_branch()
80
dc = b.controldir.sprout('dc', force_new_repo=True)
81
self.build_tree_contents([("dc/foofile", "blaaaa")])
82
dc_tree = dc.open_workingtree()
83
dc_tree.add("foofile")
86
script.run_script(self, '''
88
2>Doing on-the-fly conversion from DummyForeignVcsRepositoryFormat() to RepositoryFormat2a().
89
2>This may take some time. Upgrade the repositories to the same format for better performance.
90
2>Pushed up to revision 2.
96
def test_dpush_wt_diff(self):
97
b = self.make_dummy_builder('d').get_branch()
99
dc = b.controldir.sprout('dc', force_new_repo=True)
100
self.build_tree_contents([("dc/foofile", "blaaaa")])
101
dc_tree = dc.open_workingtree()
102
dc_tree.add("foofile")
103
newrevid = dc_tree.commit('msg')
105
self.build_tree_contents([("dc/foofile", "blaaaal")])
106
script.run_script(self, '''
107
$ brz dpush -d dc d --no-strict
108
2>Doing on-the-fly conversion from DummyForeignVcsRepositoryFormat() to RepositoryFormat2a().
109
2>This may take some time. Upgrade the repositories to the same format for better performance.
110
2>Pushed up to revision 2.
112
self.assertFileEqual("blaaaal", "dc/foofile")
113
# if the dummy vcs wasn't that dummy we could uncomment the line below
114
# self.assertFileEqual("blaaaa", "d/foofile")
115
script.run_script(self, '''
121
def test_diverged(self):
122
builder = self.make_dummy_builder('d')
124
b = builder.get_branch()
126
dc = b.controldir.sprout('dc', force_new_repo=True)
127
dc_tree = dc.open_workingtree()
129
self.build_tree_contents([("dc/foo", "bar")])
130
dc_tree.commit('msg1')
132
builder.build_snapshot(None,
133
[('modify', ('fooid', 'blie'))], revision_id='revid2')
135
output, error = self.run_bzr("dpush -d dc d", retcode=3)
136
self.assertEqual(output, "")
137
self.assertContainsRe(error, "have diverged")
140
class TestDpushStrictMixin(object):
143
test_foreign.register_dummy_foreign_for_test(self)
144
# Create an empty branch where we will be able to push
145
self.foreign = self.make_branch(
146
'to', format=test_foreign.DummyForeignVcsDirFormat())
148
def set_config_push_strict(self, value):
149
br = branch.Branch.open('local')
150
br.get_config_stack().set('dpush_strict', value)
152
_default_command = ['dpush', '../to']
155
class TestDpushStrictWithoutChanges(TestDpushStrictMixin,
156
test_push.TestPushStrictWithoutChanges):
159
test_push.TestPushStrictWithoutChanges.setUp(self)
160
TestDpushStrictMixin.setUp(self)
163
class TestDpushStrictWithChanges(TestDpushStrictMixin,
164
test_push.TestPushStrictWithChanges):
166
scenarios = test_push.strict_push_change_scenarios
168
_changes_type = None # Set by load_tests
171
test_push.TestPushStrictWithChanges.setUp(self)
172
TestDpushStrictMixin.setUp(self)
174
def test_push_with_revision(self):
175
raise tests.TestNotApplicable('dpush does not handle --revision')
added
removed
breezy/tests/blackbox/test_dpush.py
