← 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: Jelmer Vernooij
  • Date: 2012-02-20 12:19:29 UTC
  • mfrom: (6437.23.11 2.5)
  • mto: (6581.1.1 trunk)
  • mto: This revision was merged to the branch mainline in revision 6582.
  • Revision ID: jelmer@samba.org-20120220121929-7ni2psvjoatm1yp4
Merge bzr/2.5.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_reconfigure.py
21
21
    workingtree,
22
22
    )
23
23
from bzrlib.branchbuilder import BranchBuilder
24
 
 
25
 
 
26
 
class TestReconfigure(tests.TestCaseWithTransport):
 
24
from bzrlib.tests.script import TestCaseWithTransportAndScript
 
25
 
 
26
 
 
27
class TestReconfigure(TestCaseWithTransportAndScript):
27
28
 
28
29
    def test_no_type(self):
29
30
        branch = self.make_branch('branch')
175
176
        self.run_bzr('revert', working_dir='checkout')
176
177
        self.check_file_contents('checkout/file', 'foo\n')
177
178
 
178
 
    def test_lightweight_knit_checkout_to_tree(self, format=None):
 
179
    def test_lightweight_knit_checkout_to_tree(self):
179
180
        self.test_lightweight_format_checkout_to_tree('knit')
180
181
 
181
 
    def test_lightweight_pack092_checkout_to_tree(self, format=None):
 
182
    def test_lightweight_pack092_checkout_to_tree(self):
182
183
        self.test_lightweight_format_checkout_to_tree('pack-0.92')
183
184
 
184
 
    def test_lightweight_rich_root_pack_checkout_to_tree(self, format=None):
 
185
    def test_lightweight_rich_root_pack_checkout_to_tree(self):
185
186
        self.test_lightweight_format_checkout_to_tree('rich-root-pack')
186
187
 
 
188
    def test_branch_and_use_shared(self):
 
189
        self.run_script("""\
 
190
$ bzr init -q branch
 
191
$ echo foo > branch/foo
 
192
$ bzr add -q branch/foo
 
193
$ bzr commit -q -m msg branch
 
194
$ bzr init-repo -q .
 
195
$ bzr reconfigure --branch --use-shared branch
 
196
$ bzr info branch
 
197
Repository branch (format: ...)
 
198
Location:
 
199
  shared repository: .
 
200
  repository branch: branch
 
201
""")
 
202
 
 
203
    def test_use_shared_and_branch(self):
 
204
        self.run_script("""\
 
205
$ bzr init -q branch
 
206
$ echo foo > branch/foo
 
207
$ bzr add -q branch/foo
 
208
$ bzr commit -q -m msg branch
 
209
$ bzr init-repo -q .
 
210
$ bzr reconfigure --use-shared --branch branch
 
211
$ bzr info branch
 
212
Repository branch (format: ...)
 
213
Location:
 
214
  shared repository: .
 
215
  repository branch: branch
 
216
""")
 
217
 
187
218
 
188
219
class TestReconfigureStacking(tests.TestCaseWithTransport):
189
220