/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/blackbox/test_log.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/blackbox/test_log.py
31
31
    test_log,
32
32
    features,
33
33
    )
34
 
from breezy.bzr.tests.matchers import ContainsNoVfsCalls
35
34
 
36
35
 
37
36
class TestLog(tests.TestCaseWithTransport, test_log.TestLogMixin):
300
299
        return builder
301
300
 
302
301
    def test_not_an_ancestor(self):
303
 
        self.assertRaises(errors.BzrCommandError,
 
302
        self.assertRaises(errors.CommandError,
304
303
                          log._generate_all_revisions,
305
304
                          self.branch, '1.1.1', '2.1.3', 'reverse',
306
305
                          delayed_graph_generation=True)
307
306
 
308
307
    def test_wrong_order(self):
309
 
        self.assertRaises(errors.BzrCommandError,
 
308
        self.assertRaises(errors.CommandError,
310
309
                          log._generate_all_revisions,
311
310
                          self.branch, '5', '2.1.3', 'reverse',
312
311
                          delayed_graph_generation=True)