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

  • Committer: Jelmer Vernooij
  • Date: 2019-03-04 00:16:27 UTC
  • mfrom: (7293 work)
  • mto: This revision was merged to the branch mainline in revision 7318.
  • Revision ID: jelmer@jelmer.uk-20190304001627-v6u7o6pf97tukhek
Merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/test_bisect.py
69
69
        test_file_append.close()
70
70
        self.tree.add(self.tree.relpath(os.path.join(os.getcwd(),
71
71
                                                     'test_file_append')))
72
 
        self.tree.commit(message = "add test files")
 
72
        self.tree.commit(message="add test files")
73
73
 
74
74
        ControlDir.open(".").sprout("../temp-clone")
75
75
        clone_bzrdir = ControlDir.open("../temp-clone")
81
81
            test_file_append = open("../temp-clone/test_file_append", "a")
82
82
            test_file_append.write(content + "\n")
83
83
            test_file_append.close()
84
 
            clone_tree.commit(message = "make branch test change")
 
84
            clone_tree.commit(message="make branch test change")
85
85
            saved_subtree_revid = clone_tree.branch.last_revision()
86
86
 
87
87
        self.tree.merge_from_branch(clone_tree.branch)
91
91
        test_file_append = open("test_file_append", "a")
92
92
        test_file_append.write("two\n")
93
93
        test_file_append.close()
94
 
        self.tree.commit(message = "merge external branch")
 
94
        self.tree.commit(message="merge external branch")
95
95
        shutil.rmtree("../temp-clone")
96
96
 
97
97
        self.subtree_rev = saved_subtree_revid
104
104
            test_file_append = open("test_file_append", "a")
105
105
            test_file_append.write(content + "\n")
106
106
            test_file_append.close()
107
 
            self.tree.commit(message = "make test change")
 
107
            self.tree.commit(message="make test change")
108
108
 
109
109
 
110
110
class BisectHarnessTests(BisectTestCase):
186
186
 
187
187
    def testLoad(self):
188
188
        """Test loading a log."""
189
 
        preloaded_log = open(os.path.join('.bzr', bisect.BISECT_INFO_PATH), "w")
 
189
        preloaded_log = open(os.path.join(
 
190
            '.bzr', bisect.BISECT_INFO_PATH), "w")
190
191
        preloaded_log.write("rev1 yes\nrev2 no\nrev3 yes\n")
191
192
        preloaded_log.close()
192
193
 
199
200
    def testSave(self):
200
201
        """Test saving the log."""
201
202
        bisect_log = bisect.BisectLog(self.tree.controldir)
202
 
        bisect_log._items = [(b"rev1", "yes"), (b"rev2", "no"), (b"rev3", "yes")]
 
203
        bisect_log._items = [
 
204
            (b"rev1", "yes"), (b"rev2", "no"), (b"rev3", "yes")]
203
205
        bisect_log.save()
204
206
 
205
207
        with open(os.path.join('.bzr', bisect.BISECT_INFO_PATH), 'rb') as logfile: