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

  • Committer: Jelmer Vernooij
  • Date: 2018-05-06 11:48:54 UTC
  • mto: This revision was merged to the branch mainline in revision 6960.
  • Revision ID: jelmer@jelmer.uk-20180506114854-h4qd9ojaqy8wxjsd
Move .mailmap to root.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/blackbox/test_bisect.py
15
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
16
16
 
17
17
 
 
18
 
18
19
"""Tests of the 'brz bisect' command."""
19
20
 
20
21
from __future__ import absolute_import
28
29
from .. import (
29
30
    KnownFailure,
30
31
    TestCaseWithTransport,
31
 
    TestSkipped,
32
32
    )
33
33
from ...bzr.bzrdir import BzrDir
34
34
 
72
72
        test_file_append.close()
73
73
        self.tree.add(self.tree.relpath(os.path.join(os.getcwd(),
74
74
                                                     'test_file_append')))
75
 
        self.tree.commit(message="add test files")
 
75
        self.tree.commit(message = "add test files")
76
76
 
77
77
        BzrDir.open(".").sprout("../temp-clone")
78
78
        clone_bzrdir = BzrDir.open("../temp-clone")
84
84
            test_file_append = open("../temp-clone/test_file_append", "a")
85
85
            test_file_append.write(content + "\n")
86
86
            test_file_append.close()
87
 
            clone_tree.commit(message="make branch test change")
 
87
            clone_tree.commit(message = "make branch test change")
88
88
            saved_subtree_revid = clone_tree.branch.last_revision()
89
89
 
90
90
        self.tree.merge_from_branch(clone_tree.branch)
94
94
        test_file_append = open("test_file_append", "a")
95
95
        test_file_append.write("two\n")
96
96
        test_file_append.close()
97
 
        self.tree.commit(message="merge external branch")
 
97
        self.tree.commit(message = "merge external branch")
98
98
        shutil.rmtree("../temp-clone")
99
99
 
100
100
        self.subtree_rev = saved_subtree_revid
107
107
            test_file_append = open("test_file_append", "a")
108
108
            test_file_append.write(content + "\n")
109
109
            test_file_append.close()
110
 
            self.tree.commit(message="make test change")
 
110
            self.tree.commit(message = "make test change")
111
111
 
112
112
    def testWorkflow(self):
113
113
        """Run through a basic usage scenario."""
277
277
        try:
278
278
            self.assertRevno(2)
279
279
        except AssertionError:
280
 
            raise KnownFailure("bisect does not drill down into merge commits: "
281
 
                               "https://bugs.launchpad.net/bzr-bisect/+bug/539937")
 
280
            raise KnownFailure\
 
281
                ("bisect does not drill down into merge commits: "
 
282
                 "https://bugs.launchpad.net/bzr-bisect/+bug/539937")
282
283
 
283
284
    def testRunScriptSubtree(self):
284
285
        """Make a test script and run it."""
296
297
        try:
297
298
            self.assertRevno(1.2)
298
299
        except AssertionError:
299
 
            raise KnownFailure("bisect does not drill down into merge commits: "
300
 
                               "https://bugs.launchpad.net/bzr-bisect/+bug/539937")
 
300
            raise KnownFailure\
 
301
                ("bisect does not drill down into merge commits: "
 
302
                 "https://bugs.launchpad.net/bzr-bisect/+bug/539937")