diff options
Diffstat (limited to 'bzrlib/tests/blackbox/test_dpush.py')
| -rw-r--r-- | bzrlib/tests/blackbox/test_dpush.py | 174 |
1 files changed, 174 insertions, 0 deletions
diff --git a/bzrlib/tests/blackbox/test_dpush.py b/bzrlib/tests/blackbox/test_dpush.py new file mode 100644 index 0000000..32f05d5 --- /dev/null +++ b/bzrlib/tests/blackbox/test_dpush.py @@ -0,0 +1,174 @@ +# Copyright (C) 2009-2012 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.""" + + +from bzrlib import ( + branch, + tests, + ) +from bzrlib.tests import ( + script, + test_foreign, + ) +from bzrlib.tests.blackbox import test_push +from bzrlib.tests.scenarios import ( + load_tests_apply_scenarios, + ) + + +load_tests = load_tests_apply_scenarios + + +class TestDpush(tests.TestCaseWithTransport): + + 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') + + script.run_script(self, """ + $ bzr dpush -d dc d + 2>Doing on-the-fly conversion from DummyForeignVcsRepositoryFormat() to RepositoryFormat2a(). + 2>This may take some time. Upgrade the repositories to the same format for better performance. + 2>Pushed up to revision 2. + $ bzr 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") + + script.run_script(self, ''' + $ bzr dpush -d dc d + 2>Doing on-the-fly conversion from DummyForeignVcsRepositoryFormat() to RepositoryFormat2a(). + 2>This may take some time. Upgrade the repositories to the same format for better performance. + 2>Pushed up to revision 2. + $ bzr revno dc + 2 + $ bzr 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")]) + script.run_script(self, ''' + $ bzr dpush -d dc d --no-strict + 2>Doing on-the-fly conversion from DummyForeignVcsRepositoryFormat() to RepositoryFormat2a(). + 2>This may take some time. Upgrade the repositories to the same format for better performance. + 2>Pushed up to revision 2. + ''') + self.assertFileEqual("blaaaal", "dc/foofile") + # if the dummy vcs wasn't that dummy we could uncomment the line below + # self.assertFileEqual("blaaaa", "d/foofile") + script.run_script(self, ''' + $ bzr status dc + modified: + foofile + ''') + + 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): + br = branch.Branch.open('local') + br.get_config_stack().set('dpush_strict', value) + + _default_command = ['dpush', '../to'] + + +class TestDpushStrictWithoutChanges(TestDpushStrictMixin, + test_push.TestPushStrictWithoutChanges): + + def setUp(self): + test_push.TestPushStrictWithoutChanges.setUp(self) + TestDpushStrictMixin.setUp(self) + + +class TestDpushStrictWithChanges(TestDpushStrictMixin, + test_push.TestPushStrictWithChanges): + + scenarios = test_push.strict_push_change_scenarios + + _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') |