~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: Robert Collins
  • Date: 2009-08-04 04:36:34 UTC
  • mfrom: (4583 +trunk)
  • mto: This revision was merged to the branch mainline in revision 4593.
  • Revision ID: robertc@robertcollins.net-20090804043634-2iu9wpcgs273i97s
Merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
 
# Copyright (C) 2007 Canonical Ltd
 
1
# Copyright (C) 2007, 2009 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
36
36
        out, err = self.run_bzr('check')
37
37
        self.assertContainsRe(err, r"Checking working tree at '.*'\.\n")
38
38
        self.assertContainsRe(err, r"Checking repository at '.*'\.\n")
 
39
        # the root directory may be in the texts for rich root formats
39
40
        self.assertContainsRe(err, r"checked repository.*\n"
40
41
                                   r"     1 revisions\n"
41
 
                                   r"     0 file-ids\n"
 
42
                                   r"     [01] file-ids\n"
42
43
                                   )
43
44
        self.assertContainsRe(err, r"Checking branch at '.*'\.\n")
44
45
        self.assertContainsRe(err, r"checked branch.*")
57
58
        self.assertContainsRe(err, r"^Checking repository at '.*'\.\n"
58
59
                                   r"checked repository.*\n"
59
60
                                   r"     1 revisions\n"
60
 
                                   r"     0 file-ids\n"
 
61
                                   r"     [01] file-ids\n"
61
62
                                   )
62
63
 
63
64
    def test_check_tree(self):