← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_reconfigure.py

  • Committer: Martin Packman
  • Date: 2012-01-05 09:50:04 UTC
  • mfrom: (6424 +trunk)
  • mto: This revision was merged to the branch mainline in revision 6426.
  • Revision ID: martin.packman@canonical.com-20120105095004-mia9xb7y0efmto0v
Merge bzr.dev to resolve conflicts in bzrlib.builtins

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_reconfigure.py
21
21
    reconfigure,
22
22
    repository,
23
23
    tests,
 
24
    vf_repository,
24
25
    workingtree,
25
26
    )
26
27
 
258
259
    def test_branch_to_lightweight_checkout_failure(self):
259
260
        parent, child, reconfiguration = \
260
261
            self.prepare_branch_to_lightweight_checkout()
261
 
        old_Repository_fetch = repository.Repository.fetch
262
 
        repository.Repository.fetch = None
 
262
        old_Repository_fetch = vf_repository.VersionedFileRepository.fetch
 
263
        vf_repository.VersionedFileRepository.fetch = None
263
264
        try:
264
265
            self.assertRaises(TypeError, reconfiguration.apply)
265
266
        finally:
266
 
            repository.Repository.fetch = old_Repository_fetch
 
267
            vf_repository.VersionedFileRepository.fetch = old_Repository_fetch
267
268
        child = _mod_branch.Branch.open('child')
268
269
        self.assertContainsRe(child.base, 'child/$')
269
270