/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

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

Final tweak.

* bzrlib/tests/blackbox/test_dpush.py:
(TestDpushStrictMixin.setUp): This is really the mixin setup.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_dpush.py
140
140
 
141
141
class TestDpushStrictMixin(object):
142
142
 
143
 
    def make_foreign_branch(self, relpath='to'):
 
143
    def setUp(self):
 
144
        test_foreign.register_dummy_foreign_for_test(self)
144
145
        # Create an empty branch where we will be able to push
145
146
        self.foreign = self.make_branch(
146
 
            relpath, format=test_foreign.DummyForeignVcsDirFormat())
 
147
            'to', format=test_foreign.DummyForeignVcsDirFormat())
147
148
 
148
149
    def set_config_push_strict(self, value):
149
150
        # set config var (any of bazaar.conf, locations.conf, branch.conf
172
173
                                    test_push.TestPushStrictWithoutChanges):
173
174
 
174
175
    def setUp(self):
175
 
        super(TestDpushStrictWithoutChanges, self).setUp()
176
 
        test_foreign.register_dummy_foreign_for_test(self)
177
 
        self.make_foreign_branch()
 
176
        test_push.TestPushStrictWithoutChanges.setUp(self)
 
177
        TestDpushStrictMixin.setUp(self)
178
178
 
179
179
 
180
180
class TestDpushStrictWithChanges(TestDpushStrictMixin,
183
183
    _changes_type = None # Set by load_tests
184
184
 
185
185
    def setUp(self):
186
 
        super(TestDpushStrictWithChanges, self).setUp()
187
 
        test_foreign.register_dummy_foreign_for_test(self)
188
 
        self.make_foreign_branch()
 
186
        test_push.TestPushStrictWithChanges.setUp(self)
 
187
        TestDpushStrictMixin.setUp(self)
189
188
 
190
189
    def test_push_with_revision(self):
191
190
        raise tests.TestNotApplicable('dpush does not handle --revision')