← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/blackbox/test_dpush.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2010-09-29 22:03:03 UTC
  • mfrom: (5416.2.6 jam-integration)
  • Revision ID: pqm@pqm.ubuntu.com-20100929220303-cr95h8iwtggco721
(mbp) Add 'break-lock --force'

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_dpush.py
 
1
# Copyright (C) 2009, 2010 Canonical Ltd
 
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
 
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
16
 
 
17
 
 
18
"""Black-box tests for bzr dpush."""
 
19
 
 
20
 
 
21
import os
 
22
 
 
23
from bzrlib import (
 
24
    branch,
 
25
    bzrdir,
 
26
    foreign,
 
27
    tests,
 
28
    workingtree,
 
29
    )
 
30
from bzrlib.tests import (
 
31
    blackbox,
 
32
    script,
 
33
    test_foreign,
 
34
    )
 
35
from bzrlib.tests.blackbox import test_push
 
36
 
 
37
 
 
38
def load_tests(standard_tests, module, loader):
 
39
    """Multiply tests for the dpush command."""
 
40
    result = loader.suiteClass()
 
41
 
 
42
    # one for each king of change
 
43
    changes_tests, remaining_tests = tests.split_suite_by_condition(
 
44
        standard_tests, tests.condition_isinstance((
 
45
                TestDpushStrictWithChanges,
 
46
                )))
 
47
    changes_scenarios = [
 
48
        ('uncommitted',
 
49
         dict(_changes_type= '_uncommitted_changes')),
 
50
        ('pending-merges',
 
51
         dict(_changes_type= '_pending_merges')),
 
52
        ('out-of-sync-trees',
 
53
         dict(_changes_type= '_out_of_sync_trees')),
 
54
        ]
 
55
    tests.multiply_tests(changes_tests, changes_scenarios, result)
 
56
    # No parametrization for the remaining tests
 
57
    result.addTests(remaining_tests)
 
58
 
 
59
    return result
 
60
 
 
61
 
 
62
class TestDpush(tests.TestCaseWithTransport):
 
63
 
 
64
    def setUp(self):
 
65
        super(TestDpush, self).setUp()
 
66
        test_foreign.register_dummy_foreign_for_test(self)
 
67
 
 
68
    def make_dummy_builder(self, relpath):
 
69
        builder = self.make_branch_builder(
 
70
            relpath, format=test_foreign.DummyForeignVcsDirFormat())
 
71
        builder.build_snapshot('revid', None,
 
72
            [('add', ('', 'TREE_ROOT', 'directory', None)),
 
73
             ('add', ('foo', 'fooid', 'file', 'bar'))])
 
74
        return builder
 
75
 
 
76
    def test_dpush_native(self):
 
77
        target_tree = self.make_branch_and_tree("dp")
 
78
        source_tree = self.make_branch_and_tree("dc")
 
79
        output, error = self.run_bzr("dpush -d dc dp", retcode=3)
 
80
        self.assertEquals("", output)
 
81
        self.assertContainsRe(error, 'in the same VCS, lossy push not necessary. Please use regular push.')
 
82
 
 
83
    def test_dpush(self):
 
84
        branch = self.make_dummy_builder('d').get_branch()
 
85
 
 
86
        dc = branch.bzrdir.sprout('dc', force_new_repo=True)
 
87
        self.build_tree(("dc/foo", "blaaaa"))
 
88
        dc.open_workingtree().commit('msg')
 
89
 
 
90
        script.run_script(self, """
 
91
            $ bzr dpush -d dc d
 
92
            2>Pushed up to revision 2.
 
93
            $ bzr status dc
 
94
            """)
 
95
 
 
96
    def test_dpush_new(self):
 
97
        b = self.make_dummy_builder('d').get_branch()
 
98
 
 
99
        dc = b.bzrdir.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
        dc_tree.commit("msg")
 
104
 
 
105
        script.run_script(self, '''
 
106
            $ bzr dpush -d dc d
 
107
            $ bzr revno dc
 
108
            2
 
109
            $ bzr status dc
 
110
            ''')
 
111
 
 
112
    def test_dpush_wt_diff(self):
 
113
        b = self.make_dummy_builder('d').get_branch()
 
114
 
 
115
        dc = b.bzrdir.sprout('dc', force_new_repo=True)
 
116
        self.build_tree_contents([("dc/foofile", "blaaaa")])
 
117
        dc_tree = dc.open_workingtree()
 
118
        dc_tree.add("foofile")
 
119
        newrevid = dc_tree.commit('msg')
 
120
 
 
121
        self.build_tree_contents([("dc/foofile", "blaaaal")])
 
122
        script.run_script(self, '''
 
123
            $ bzr dpush -d dc d --no-strict
 
124
            ''')
 
125
        self.assertFileEqual("blaaaal", "dc/foofile")
 
126
        # if the dummy vcs wasn't that dummy we could uncomment the line below
 
127
        # self.assertFileEqual("blaaaa", "d/foofile")
 
128
        script.run_script(self, '''
 
129
            $ bzr status dc
 
130
            modified:
 
131
              foofile
 
132
            ''')
 
133
 
 
134
    def test_diverged(self):
 
135
        builder = self.make_dummy_builder('d')
 
136
 
 
137
        b = builder.get_branch()
 
138
 
 
139
        dc = b.bzrdir.sprout('dc', force_new_repo=True)
 
140
        dc_tree = dc.open_workingtree()
 
141
 
 
142
        self.build_tree_contents([("dc/foo", "bar")])
 
143
        dc_tree.commit('msg1')
 
144
 
 
145
        builder.build_snapshot('revid2', None,
 
146
          [('modify', ('fooid', 'blie'))])
 
147
 
 
148
        output, error = self.run_bzr("dpush -d dc d", retcode=3)
 
149
        self.assertEquals(output, "")
 
150
        self.assertContainsRe(error, "have diverged")
 
151
 
 
152
 
 
153
class TestDpushStrictMixin(object):
 
154
 
 
155
    def setUp(self):
 
156
        test_foreign.register_dummy_foreign_for_test(self)
 
157
        # Create an empty branch where we will be able to push
 
158
        self.foreign = self.make_branch(
 
159
            'to', format=test_foreign.DummyForeignVcsDirFormat())
 
160
 
 
161
    def set_config_push_strict(self, value):
 
162
        # set config var (any of bazaar.conf, locations.conf, branch.conf
 
163
        # should do)
 
164
        conf = self.tree.branch.get_config()
 
165
        conf.set_user_option('dpush_strict', value)
 
166
 
 
167
    _default_command = ['dpush', '../to']
 
168
 
 
169
 
 
170
class TestDpushStrictWithoutChanges(TestDpushStrictMixin,
 
171
                                    test_push.TestPushStrictWithoutChanges):
 
172
 
 
173
    def setUp(self):
 
174
        test_push.TestPushStrictWithoutChanges.setUp(self)
 
175
        TestDpushStrictMixin.setUp(self)
 
176
 
 
177
 
 
178
class TestDpushStrictWithChanges(TestDpushStrictMixin,
 
179
                                 test_push.TestPushStrictWithChanges):
 
180
 
 
181
    _changes_type = None # Set by load_tests
 
182
 
 
183
    def setUp(self):
 
184
        test_push.TestPushStrictWithChanges.setUp(self)
 
185
        TestDpushStrictMixin.setUp(self)
 
186
 
 
187
    def test_push_with_revision(self):
 
188
        raise tests.TestNotApplicable('dpush does not handle --revision')
 
189