/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 breezy/tests/test_switch.py

  • Committer: Breezy landing bot
  • Author(s): Jelmer Vernooij
  • Date: 2020-06-23 01:17:33 UTC
  • mfrom: (7516.1.1 merge-3.1)
  • Revision ID: breezy.the.bot@gmail.com-20200623011733-ohfy5ukvyehd2kpf
Merge lp:brz/3.1.

Merged from https://code.launchpad.net/~jelmer/brz/merge-3.1/+merge/386223

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/test_switch.py
123
123
        to_branch = branch.Branch.open('branch-2')
124
124
        # Check fails without --force
125
125
        err = self.assertRaises(
126
 
            (errors.BzrCommandError, errors.NotBranchError),
 
126
            (errors.CommandError, errors.NotBranchError),
127
127
            switch.switch, checkout.controldir, to_branch)
128
 
        if isinstance(err, errors.BzrCommandError):
 
128
        if isinstance(err, errors.CommandError):
129
129
            self.assertContainsRe(str(err),
130
130
                                  'Unable to connect to current master branch .*'
131
131
                                  'To switch anyway, use --force.')
147
147
        tree2.commit('rev2')
148
148
        checkout.merge_from_branch(tree2.branch)
149
149
        # Check the error reporting is as expected
150
 
        err = self.assertRaises(errors.BzrCommandError,
 
150
        err = self.assertRaises(errors.CommandError,
151
151
                                switch.switch, checkout.controldir, tree2.branch)
152
152
        self.assertContainsRe(str(err),
153
153
                              "Pending merges must be committed or reverted before using switch")
220
220
        checkout.commit(message='local only commit', local=True)
221
221
        self.build_tree(['checkout/file-4'])
222
222
        # Check the error reporting is as expected
223
 
        err = self.assertRaises(errors.BzrCommandError,
 
223
        err = self.assertRaises(errors.CommandError,
224
224
                                switch.switch, checkout.controldir, to_branch)
225
225
        self.assertContainsRe(str(err),
226
226
                              'Cannot switch as local commits found in the checkout.')