← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2009-06-22 17:11:20 UTC
  • mfrom: (4398.8.10 1.16-commit-fulltext)
  • Revision ID: pqm@pqm.ubuntu.com-20090622171120-fuxez9ylfqpxynqn
(jam) Add VF._add_text and reduce memory overhead during commit (see
        bug #109114)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_reconfigure.py
1
 
# Copyright (C) 2007, 2009 Canonical Ltd
 
1
# Copyright (C) 2007 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
20
20
    tests,
21
21
    workingtree,
22
22
    )
23
 
from bzrlib.branchbuilder import BranchBuilder
24
23
 
25
24
 
26
25
class TestReconfigure(tests.TestCaseWithTransport):
131
130
        tree.add('foo')
132
131
        self.run_bzr('reconfigure --with-no-trees --force',
133
132
            working_dir='repo/branch')
134
 
        self.assertPathExists('repo/branch/foo')
 
133
        self.failUnlessExists('repo/branch/foo')
135
134
        tree = workingtree.WorkingTree.open('repo/branch')
136
135
 
137
136
    def test_shared_format_to_standalone(self, format=None):
183
182
 
184
183
    def test_lightweight_rich_root_pack_checkout_to_tree(self, format=None):
185
184
        self.test_lightweight_format_checkout_to_tree('rich-root-pack')
186
 
 
187
 
 
188
 
class TestReconfigureStacking(tests.TestCaseWithTransport):
189
 
 
190
 
    def test_reconfigure_stacking(self):
191
 
        """Test a fairly realistic scenario for stacking:
192
 
 
193
 
         * make a branch with some history
194
 
         * branch it
195
 
         * make the second branch stacked on the first
196
 
         * commit in the second
197
 
         * then make the second unstacked, so it has to fill in history from
198
 
           the original fallback lying underneath its original content
199
 
 
200
 
        See discussion in <https://bugs.launchpad.net/bzr/+bug/391411>
201
 
        """
202
 
        # there are also per_branch tests that exercise remote operation etc
203
 
        tree_1 = self.make_branch_and_tree('b1', format='2a')
204
 
        self.build_tree(['b1/foo'])
205
 
        tree_1.add(['foo'])
206
 
        tree_1.commit('add foo')
207
 
        branch_1 = tree_1.branch
208
 
        # now branch and commit again
209
 
        bzrdir_2 = tree_1.bzrdir.sprout('b2')
210
 
        tree_2 = bzrdir_2.open_workingtree()
211
 
        branch_2 = tree_2.branch
212
 
        # now reconfigure to be stacked
213
 
        out, err = self.run_bzr('reconfigure --stacked-on b1 b2')
214
 
        self.assertContainsRe(out,
215
 
            '^.*/b2/ is now stacked on ../b1\n$')
216
 
        self.assertEquals('', err)
217
 
        # can also give the absolute URL of the branch, and it gets stored 
218
 
        # as a relative path if possible
219
 
        out, err = self.run_bzr('reconfigure --stacked-on %s b2'
220
 
            % (self.get_url('b1'),))
221
 
        self.assertContainsRe(out,
222
 
            '^.*/b2/ is now stacked on ../b1\n$')
223
 
        self.assertEquals('', err)
224
 
        # It should be given a relative URL to the destination, if possible,
225
 
        # because that's most likely to work across different transports
226
 
        self.assertEquals(branch_2.get_stacked_on_url(),
227
 
            '../b1')
228
 
        # commit, and it should be stored into b2's repo
229
 
        self.build_tree_contents([('foo', 'new foo')])
230
 
        tree_2.commit('update foo')
231
 
        # Now turn it off again
232
 
        out, err = self.run_bzr('reconfigure --unstacked b2')
233
 
        self.assertContainsRe(out,
234
 
            '^.*/b2/ is now not stacked\n$')
235
 
        self.assertEquals('', err)
236
 
        self.assertRaises(errors.NotStacked,
237
 
            branch_2.get_stacked_on_url)
238
 
 
239
 
    # XXX: Needs a test for reconfiguring stacking and shape at the same time;
240
 
    # no branch at location; stacked-on is not a branch; quiet mode.
241
 
    # -- mbp 20090706