/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_check.py

  • Committer: Jelmer Vernooij
  • Date: 2018-07-08 14:45:27 UTC
  • mto: This revision was merged to the branch mainline in revision 7036.
  • Revision ID: jelmer@jelmer.uk-20180708144527-codhlvdcdg9y0nji
Fix a bunch of merge tests.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/blackbox/test_check.py
1
 
# Copyright (C) 2007, 2009 Canonical Ltd
 
1
# Copyright (C) 2007-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
16
16
 
17
17
"""Tests for the 'check' CLI command."""
18
18
 
19
 
from bzrlib.tests import ChrootedTestCase
20
 
from bzrlib.tests.blackbox import ExternalBase
21
 
 
22
 
 
23
 
class TestCheck(ExternalBase):
 
19
from breezy.tests import ChrootedTestCase
 
20
from breezy.tests import TestCaseWithTransport
 
21
 
 
22
 
 
23
class TestCheck(TestCaseWithTransport):
24
24
 
25
25
    def test_check_no_tree(self):
26
26
        self.make_branch('.')
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")
 
37
        self.assertContainsRe(err, br"Checking working tree at '.*'\.\n")
 
38
        self.assertContainsRe(err, br"Checking repository at '.*'\.\n")
39
39
        # the root directory may be in the texts for rich root formats
40
 
        self.assertContainsRe(err, r"checked repository.*\n"
41
 
                                   r"     1 revisions\n"
42
 
                                   r"     [01] file-ids\n"
 
40
        self.assertContainsRe(err, br"checked repository.*\n"
 
41
                                   br"     1 revisions\n"
 
42
                                   br"     [01] file-ids\n"
43
43
                                   )
44
 
        self.assertContainsRe(err, r"Checking branch at '.*'\.\n")
45
 
        self.assertContainsRe(err, r"checked branch.*")
 
44
        self.assertContainsRe(err, br"Checking branch at '.*'\.\n")
 
45
        self.assertContainsRe(err, br"checked branch.*")
46
46
 
47
47
    def test_check_branch(self):
48
48
        tree = self.make_branch_and_tree('.')
49
49
        tree.commit('foo')
50
50
        out, err = self.run_bzr('check --branch')
51
 
        self.assertContainsRe(err, r"^Checking branch at '.*'\.\n"
52
 
                                   r"checked branch.*")
 
51
        self.assertContainsRe(err, br"^Checking branch at '.*'\.\n"
 
52
                                   br"checked branch.*")
53
53
 
54
54
    def test_check_repository(self):
55
55
        tree = self.make_branch_and_tree('.')
56
56
        tree.commit('foo')
57
57
        out, err = self.run_bzr('check --repo')
58
 
        self.assertContainsRe(err, r"^Checking repository at '.*'\.\n"
59
 
                                   r"checked repository.*\n"
60
 
                                   r"     1 revisions\n"
61
 
                                   r"     [01] file-ids\n"
 
58
        self.assertContainsRe(err, br"^Checking repository at '.*'\.\n"
 
59
                                   br"checked repository.*\n"
 
60
                                   br"     1 revisions\n"
 
61
                                   br"     [01] file-ids\n"
62
62
                                   )
63
63
 
64
64
    def test_check_tree(self):
65
65
        tree = self.make_branch_and_tree('.')
66
66
        tree.commit('foo')
67
67
        out, err = self.run_bzr('check --tree')
68
 
        self.assertContainsRe(err, r"^Checking working tree at '.*'\.\n$")
 
68
        self.assertContainsRe(err, br"^Checking working tree at '.*'\.\n$")
69
69
 
70
70
    def test_partial_check(self):
71
71
        tree = self.make_branch_and_tree('.')
72
72
        tree.commit('foo')
73
73
        out, err = self.run_bzr('check --tree --branch')
74
 
        self.assertContainsRe(err, r"^Checking working tree at '.*'\.\n"
75
 
                                   r"Checking branch at '.*'\.\n"
76
 
                                   r"checked branch.*")
 
74
        self.assertContainsRe(err, br"^Checking working tree at '.*'\.\n"
 
75
                                   br"Checking branch at '.*'\.\n"
 
76
                                   br"checked branch.*")
77
77
 
78
78
    def test_check_missing_tree(self):
79
79
        branch = self.make_branch('.')
84
84
        branch = self.make_branch('.')
85
85
        out, err = self.run_bzr('check --tree --branch')
86
86
        self.assertContainsRe(err,
87
 
            r"Checking branch at '.*'\.\n"
88
 
            r"No working tree found at specified location\.\n"
89
 
            r"checked branch.*")
 
87
            br"Checking branch at '.*'\.\n"
 
88
            br"No working tree found at specified location\.\n"
 
89
            br"checked branch.*")
90
90
 
91
91
    def test_check_missing_branch_in_shared_repo(self):
92
92
        self.make_repository('shared', shared=True)
93
93
        out, err = self.run_bzr('check --branch shared')
94
 
        self.assertEqual(err, "No branch found at specified location.\n")
 
94
        self.assertEqual(err, b"No branch found at specified location.\n")
95
95
 
96
96
 
97
97
class ChrootedCheckTests(ChrootedTestCase):
99
99
    def test_check_missing_branch(self):
100
100
        out, err = self.run_bzr(
101
101
            'check --branch %s' % self.get_readonly_url(''))
102
 
        self.assertEqual(err, "No branch found at specified location.\n")
 
102
        self.assertEqual(err, b"No branch found at specified location.\n")
103
103
 
104
104
    def test_check_missing_repository(self):
105
105
        out, err = self.run_bzr('check --repo %s' % self.get_readonly_url(''))
106
 
        self.assertEqual(err, "No repository found at specified location.\n")
 
106
        self.assertEqual(err, b"No repository found at specified location.\n")
107
107
 
108
108
    def test_check_missing_everything(self):
109
109
        out, err = self.run_bzr('check %s' % self.get_readonly_url(''))
110
 
        self.assertEqual(err, "No working tree found at specified location.\n"
111
 
                              "No branch found at specified location.\n"
112
 
                              "No repository found at specified location.\n")
 
110
        self.assertEqual(err, b"No working tree found at specified location.\n"
 
111
                              b"No branch found at specified location.\n"
 
112
                              b"No repository found at specified location.\n")