/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 bzrlib/tests/blackbox/test_check.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2009-08-04 14:48:59 UTC
  • mfrom: (4570.3.6 controlfiles)
  • Revision ID: pqm@pqm.ubuntu.com-20090804144859-bgjydda2yp4422it
(mbp) further LockableFiles cleanups

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_check.py
34
34
        tree = self.make_branch_and_tree('.')
35
35
        tree.commit('hallelujah')
36
36
        out, err = self.run_bzr('check')
37
 
        self.assertContainsRe(err, r"Checking working tree at '.*'\.\n")
38
 
        self.assertContainsRe(err, r"Checking repository at '.*'\.\n")
39
37
        # the root directory may be in the texts for rich root formats
40
 
        self.assertContainsRe(err, r"checked repository.*\n"
 
38
        self.assertContainsRe(err, r"^Checking working tree at '.*'\.\n"
 
39
                                   r"Checking repository at '.*'\.\n"
 
40
                                   r"checked repository.*\n"
41
41
                                   r"     1 revisions\n"
42
42
                                   r"     [01] file-ids\n"
43
 
                                   )
44
 
        self.assertContainsRe(err, r"Checking branch at '.*'\.\n")
45
 
        self.assertContainsRe(err, r"checked branch.*")
 
43
                                   r"     0 unique file texts\n"
 
44
                                   r"     0 repeated file texts\n"
 
45
                                   r"     0 unreferenced text versions\n"
 
46
                                   r"Checking branch at '.*'\.\n"
 
47
                                   r"checked branch.*\n$")
46
48
 
47
49
    def test_check_branch(self):
48
50
        tree = self.make_branch_and_tree('.')
49
51
        tree.commit('foo')
50
52
        out, err = self.run_bzr('check --branch')
51
53
        self.assertContainsRe(err, r"^Checking branch at '.*'\.\n"
52
 
                                   r"checked branch.*")
 
54
                                   r"checked branch.*\n$")
53
55
 
54
56
    def test_check_repository(self):
55
57
        tree = self.make_branch_and_tree('.')
59
61
                                   r"checked repository.*\n"
60
62
                                   r"     1 revisions\n"
61
63
                                   r"     [01] file-ids\n"
62
 
                                   )
 
64
                                   r"     0 unique file texts\n"
 
65
                                   r"     0 repeated file texts\n"
 
66
                                   r"     0 unreferenced text versions$")
63
67
 
64
68
    def test_check_tree(self):
65
69
        tree = self.make_branch_and_tree('.')
73
77
        out, err = self.run_bzr('check --tree --branch')
74
78
        self.assertContainsRe(err, r"^Checking working tree at '.*'\.\n"
75
79
                                   r"Checking branch at '.*'\.\n"
76
 
                                   r"checked branch.*")
 
80
                                   r"checked branch.*\n$")
77
81
 
78
82
    def test_check_missing_tree(self):
79
83
        branch = self.make_branch('.')
84
88
        branch = self.make_branch('.')
85
89
        out, err = self.run_bzr('check --tree --branch')
86
90
        self.assertContainsRe(err,
 
91
            r"^No working tree found at specified location\.\n"
87
92
            r"Checking branch at '.*'\.\n"
88
 
            r"No working tree found at specified location\.\n"
89
 
            r"checked branch.*")
 
93
            r"checked branch.*\n$")
90
94
 
91
95
    def test_check_missing_branch_in_shared_repo(self):
92
96
        self.make_repository('shared', shared=True)