34
34
from bzrlib.tests import (
41
39
from bzrlib.transport import memory
44
load_tests = scenarios.load_tests_apply_scenarios
42
def load_tests(standard_tests, module, loader):
43
"""Multiply tests for the push command."""
44
result = loader.suiteClass()
46
# one for each king of change
47
changes_tests, remaining_tests = tests.split_suite_by_condition(
48
standard_tests, tests.condition_isinstance((
49
TestPushStrictWithChanges,
53
dict(_changes_type= '_uncommitted_changes')),
55
dict(_changes_type= '_pending_merges')),
57
dict(_changes_type= '_out_of_sync_trees')),
59
tests.multiply_tests(changes_tests, changes_scenarios, result)
60
# No parametrization for the remaining tests
61
result.addTests(remaining_tests)
47
66
class TestPush(tests.TestCaseWithTransport):
104
123
transport.delete('branch_b/c')
105
124
out, err = self.run_bzr('push', working_dir='branch_a')
106
125
path = branch_a.get_push_location()
126
self.assertEquals(out,
127
'Using saved push location: %s\n'
128
% urlutils.local_path_from_url(path))
107
129
self.assertEqual(err,
108
'Using saved push location: %s\n'
109
130
'All changes applied successfully.\n'
110
'Pushed up to revision 2.\n'
111
% urlutils.local_path_from_url(path))
131
'Pushed up to revision 2.\n')
112
132
self.assertEqual(path,
113
133
branch_b.bzrdir.root_transport.base)
114
134
# test explicit --remember
125
145
b2 = branch.Branch.open('pushed-location')
126
146
self.assertEndsWith(b2.base, 'pushed-location/')
128
def test_push_no_tree(self):
129
# bzr push --no-tree of a branch with working trees
130
b = self.make_branch_and_tree('push-from')
131
self.build_tree(['push-from/file'])
134
out, err = self.run_bzr('push --no-tree -d push-from push-to')
135
self.assertEqual('', out)
136
self.assertEqual('Created new branch.\n', err)
137
self.assertPathDoesNotExist('push-to/file')
139
148
def test_push_new_branch_revision_count(self):
140
149
# bzr push of a branch with revisions to a new location
141
150
# should print the number of revisions equal to the length of the
148
157
self.assertEqual('', out)
149
158
self.assertEqual('Created new branch.\n', err)
151
def test_push_quiet(self):
152
# test that using -q makes output quiet
153
t = self.make_branch_and_tree('tree')
154
self.build_tree(['tree/file'])
157
self.run_bzr('push -d tree pushed-to')
158
path = t.branch.get_push_location()
159
out, err = self.run_bzr('push', working_dir="tree")
160
self.assertEqual('Using saved push location: %s\nNo new revisions to push.\n' % urlutils.local_path_from_url(path), err)
161
out, err = self.run_bzr('push -q', working_dir="tree")
162
self.assertEqual('', out)
163
self.assertEqual('', err)
165
160
def test_push_only_pushes_history(self):
166
161
# Knit branches should only push the history for the current revision.
167
162
format = bzrdir.BzrDirMetaFormat1()
212
207
t.commit(allow_pointless=True,
213
208
message='first commit')
214
209
self.run_bzr('push -d from to-one')
215
self.assertPathExists('to-one')
210
self.failUnlessExists('to-one')
216
211
self.run_bzr('push -d %s %s'
217
212
% tuple(map(urlutils.local_path_to_url, ['from', 'to-two'])))
218
self.assertPathExists('to-two')
220
def test_push_repository_no_branch_doesnt_fetch_all_revs(self):
221
# See https://bugs.launchpad.net/bzr/+bug/465517
222
target_repo = self.make_repository('target')
223
source = self.make_branch_builder('source')
224
source.start_series()
225
source.build_snapshot('A', None, [
226
('add', ('', 'root-id', 'directory', None))])
227
source.build_snapshot('B', ['A'], [])
228
source.build_snapshot('C', ['A'], [])
229
source.finish_series()
230
self.run_bzr('push target -d source')
231
self.addCleanup(target_repo.lock_read().unlock)
232
# We should have pushed 'C', but not 'B', since it isn't in the
234
self.assertEqual([('A',), ('C',)], sorted(target_repo.revisions.keys()))
213
self.failUnlessExists('to-two')
236
215
def test_push_smart_non_stacked_streaming_acceptance(self):
237
216
self.setup_smart_server_with_call_log()
260
239
# being too low. If rpc_count increases, more network roundtrips have
261
240
# become necessary for this use case. Please do not adjust this number
262
241
# upwards without agreement from bzr's network support maintainers.
263
self.assertLength(13, self.hpss_calls)
242
self.assertLength(14, self.hpss_calls)
264
243
remote = branch.Branch.open('public')
265
244
self.assertEndsWith(remote.get_stacked_on_url(), '/parent')
337
316
working_dir='tree')
338
317
new_tree = workingtree.WorkingTree.open('new/tree')
339
318
self.assertEqual(tree.last_revision(), new_tree.last_revision())
340
self.assertPathExists('new/tree/a')
319
self.failUnlessExists('new/tree/a')
342
321
def test_push_use_existing(self):
343
322
"""'bzr push --use-existing-dir' can push into an existing dir.
358
337
new_tree = workingtree.WorkingTree.open('target')
359
338
self.assertEqual(tree.last_revision(), new_tree.last_revision())
360
339
# The push should have created target/a
361
self.assertPathExists('target/a')
340
self.failUnlessExists('target/a')
363
342
def test_push_use_existing_into_empty_bzrdir(self):
364
343
"""'bzr push --use-existing-dir' into a dir with an empty .bzr dir
681
660
_default_wd = 'local'
682
661
_default_errors = ['Working tree ".*/local/" has uncommitted '
683
662
'changes \(See bzr status\)\.',]
684
_default_additional_error = 'Use --no-strict to force the push.\n'
685
_default_additional_warning = 'Uncommitted changes will not be pushed.'
663
_default_pushed_revid = 'modified'
688
665
def assertPushFails(self, args):
689
out, err = self.run_bzr_error(self._default_errors,
690
self._default_command + args,
691
working_dir=self._default_wd, retcode=3)
692
self.assertContainsRe(err, self._default_additional_error)
666
self.run_bzr_error(self._default_errors, self._default_command + args,
667
working_dir=self._default_wd, retcode=3)
694
def assertPushSucceeds(self, args, with_warning=False, revid_to_push=None):
696
error_regexes = self._default_errors
699
out, err = self.run_bzr(self._default_command + args,
700
working_dir=self._default_wd,
701
error_regexes=error_regexes)
703
self.assertContainsRe(err, self._default_additional_warning)
705
self.assertNotContainsRe(err, self._default_additional_warning)
706
branch_from = branch.Branch.open(self._default_wd)
707
if revid_to_push is None:
708
revid_to_push = branch_from.last_revision()
709
branch_to = branch.Branch.open('to')
710
repo_to = branch_to.repository
711
self.assertTrue(repo_to.has_revision(revid_to_push))
712
self.assertEqual(revid_to_push, branch_to.last_revision())
669
def assertPushSucceeds(self, args, pushed_revid=None):
670
self.run_bzr(self._default_command + args,
671
working_dir=self._default_wd)
672
if pushed_revid is None:
673
pushed_revid = self._default_pushed_revid
674
tree_to = workingtree.WorkingTree.open('to')
675
repo_to = tree_to.branch.repository
676
self.assertTrue(repo_to.has_revision(pushed_revid))
677
self.assertEqual(tree_to.branch.last_revision_info()[1], pushed_revid)
738
703
self.assertPushSucceeds([])
741
strict_push_change_scenarios = [
743
dict(_changes_type= '_uncommitted_changes')),
745
dict(_changes_type= '_pending_merges')),
746
('out-of-sync-trees',
747
dict(_changes_type= '_out_of_sync_trees')),
751
706
class TestPushStrictWithChanges(tests.TestCaseWithTransport,
752
707
TestPushStrictMixin):
754
scenarios = strict_push_change_scenarios
755
709
_changes_type = None # Set by load_tests
787
741
self._default_wd = 'checkout'
788
742
self._default_errors = ["Working tree is out of date, please run"
789
743
" 'bzr update'\.",]
744
self._default_pushed_revid = 'modified-in-local'
791
746
def test_push_default(self):
792
self.assertPushSucceeds([], with_warning=True)
747
self.assertPushFails([])
794
749
def test_push_with_revision(self):
795
self.assertPushSucceeds(['-r', 'revid:added'], revid_to_push='added')
750
self.assertPushSucceeds(['-r', 'revid:added'], pushed_revid='added')
797
752
def test_push_no_strict(self):
798
753
self.assertPushSucceeds(['--no-strict'])
807
762
def test_push_bogus_config_var_ignored(self):
808
763
self.set_config_push_strict("I don't want you to be strict")
809
self.assertPushSucceeds([], with_warning=True)
764
self.assertPushFails([])
811
766
def test_push_no_strict_command_line_override_config(self):
812
767
self.set_config_push_strict('yES')
added
removed
bzrlib/tests/blackbox/test_push.py
