← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/blackbox/test_revision_info.py

  • Committer: Vincent Ladeuil
  • Date: 2010-06-23 08:19:28 UTC
  • mfrom: (5317 +trunk)
  • mto: (5247.1.11 first-try)
  • mto: This revision was merged to the branch mainline in revision 5326.
  • Revision ID: v.ladeuil+lp@free.fr-20100623081928-z9q18q30oo5as831
Merge bzr.dev into cleanup

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_revision_info.py
1
 
# Copyright (C) 2004, 2005, 2009 Canonical Ltd
 
1
# Copyright (C) 2005-2010 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
17
17
import os
18
18
 
19
19
from bzrlib.errors import BzrCommandError, NoSuchRevision
20
 
from bzrlib.tests.blackbox import ExternalBase
 
20
from bzrlib.tests import TestCaseWithTransport
21
21
from bzrlib.workingtree import WorkingTree
22
22
 
23
23
 
24
 
class TestRevisionInfo(ExternalBase):
 
24
class TestRevisionInfo(TestCaseWithTransport):
25
25
 
26
 
    def check_error(self, output, *args):
27
 
        """Verify that the expected error matches what bzr says.
 
26
    def check_output(self, output, *args):
 
27
        """Verify that the expected output matches what bzr says.
28
28
 
29
29
        The output is supplied first, so that you can supply a variable
30
30
        number of arguments to bzr.
31
31
        """
32
 
        self.assertContainsRe(self.run_bzr(args, retcode=3)[1], output)
 
32
        self.assertEquals(self.run_bzr(*args)[0], output)
33
33
 
34
34
    def test_revision_info(self):
35
35
        """Test that 'bzr revision-info' reports the correct thing."""