← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_switch.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2009-04-09 20:23:07 UTC
  • mfrom: (4265.1.4 bbc-merge)
  • Revision ID: pqm@pqm.ubuntu.com-20090409202307-n0depb16qepoe21o
(jam) Change _fetch_uses_deltas = False for CHK repos until we can
        write a better fix.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_switch.py
70
70
        os.rename('branch-1', 'branch-2')
71
71
        to_branch = branch.Branch.open('branch-2')
72
72
        # Check fails without --force
73
 
        err = self.assertRaises(
74
 
            (errors.BzrCommandError, errors.NotBranchError),
 
73
        err = self.assertRaises((errors.NotBranchError,
 
74
            errors.BoundBranchConnectionFailure),
75
75
            switch.switch, checkout.bzrdir, to_branch)
76
 
        if isinstance(err, errors.BzrCommandError):
77
 
            self.assertContainsRe(str(err),
78
 
                'Unable to connect to current master branch .*'
79
 
                'To switch anyway, use --force.')
80
76
        switch.switch(checkout.bzrdir, to_branch, force=True)
81
77
        self.failIfExists('checkout/file-1')
82
78
        self.failUnlessExists('checkout/file-2')