/b-gtk/fix-viz

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/b-gtk/fix-viz

« back to all changes in this revision

Viewing changes to tests/test_commit.py

  • Committer: Vincent Ladeuil
  • Date: 2008-06-10 15:25:47 UTC
  • mto: This revision was merged to the branch mainline in revision 504.
  • Revision ID: v.ladeuil+lp@free.fr-20080610152547-dwmil1p8pd0mfpnl
Fix third failing test (thanks to jam).

* tests/test_commit.py:
(TestPendingRevisions.test_pending_revisions_multi_merge): Fix
provided by jam: bzr we now filter the pending merges so that only
the 'heads()' are included. We just ensure that the pending merges
contain the unique tips for the ancestries.

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/test_commit.py
81
81
        rev_id1 = tree.commit('one')
82
82
        tree2 = tree.bzrdir.sprout('tree2').open_workingtree()
83
83
        rev_id2 = tree2.commit('two')
84
 
        rev_id3 = tree2.commit('three')
85
84
        tree3 = tree2.bzrdir.sprout('tree3').open_workingtree()
 
85
        rev_id3 = tree2.commit('three')
86
86
        rev_id4 = tree3.commit('four')
87
87
        rev_id5 = tree3.commit('five')
88
88
        tree.merge_from_branch(tree2.branch)
411
411
        text = diff_buffer.get_text(diff_buffer.get_start_iter(),
412
412
                                    diff_buffer.get_end_iter()).splitlines(True)
413
413
 
414
 
        self.assertEqual("=== removed file 'b'\n", text[0])
 
414
        self.assertEqual("=== modified file 'a'\n", text[0])
415
415
        self.assertContainsRe(text[1],
416
 
            r"--- b\t\d\d\d\d-\d\d-\d\d \d\d:\d\d:\d\d [+-]\d\d\d\d")
417
 
        self.assertEqual('+++ b\t1970-01-01 00:00:00 +0000\n', text[2])
418
 
        self.assertEqual('@@ -1,1 +0,0 @@\n', text[3])
419
 
        self.assertEqual('-contents of tree/b\n', text[4])
420
 
        self.assertEqual('\n', text[5])
421
 
 
422
 
        self.assertEqual("=== modified file 'a'\n", text[6])
423
 
        self.assertContainsRe(text[7],
424
416
            r"--- a\t\d\d\d\d-\d\d-\d\d \d\d:\d\d:\d\d [+-]\d\d\d\d")
 
417
        self.assertContainsRe(text[2],
 
418
            r"\+\+\+ a\t\d\d\d\d-\d\d-\d\d \d\d:\d\d:\d\d [+-]\d\d\d\d")
 
419
        self.assertEqual('@@ -1,1 +1,1 @@\n', text[3])
 
420
        self.assertEqual('-contents of tree/a\n', text[4])
 
421
        self.assertEqual('+new contents for a\n', text[5])
 
422
        self.assertEqual('\n', text[6])
 
423
 
 
424
        self.assertEqual("=== removed file 'b'\n", text[7])
425
425
        self.assertContainsRe(text[8],
426
 
            r"\+\+\+ a\t\d\d\d\d-\d\d-\d\d \d\d:\d\d:\d\d [+-]\d\d\d\d")
427
 
        self.assertEqual('@@ -1,1 +1,1 @@\n', text[9])
428
 
        self.assertEqual('-contents of tree/a\n', text[10])
429
 
        self.assertEqual('+new contents for a\n', text[11])
 
426
            r"--- b\t\d\d\d\d-\d\d-\d\d \d\d:\d\d:\d\d [+-]\d\d\d\d")
 
427
        self.assertEqual('+++ b\t1970-01-01 00:00:00 +0000\n', text[9])
 
428
        self.assertEqual('@@ -1,1 +0,0 @@\n', text[10])
 
429
        self.assertEqual('-contents of tree/b\n', text[11])
430
430
        self.assertEqual('\n', text[12])
431
431
 
432
432
        self.assertEqual('Diff for All Files', dlg._diff_label.get_text())
985
985
                         ], bencode.bdecode(file_info))
986
986
 
987
987
    def test_commit_unicode_messages(self):
988
 
        from bzrlib.tests.test_diff import UnicodeFilename
989
 
        self.requireFeature(UnicodeFilename)
 
988
        self.requireFeature(tests.UnicodeFilenameFeature)
990
989
 
991
990
        tree = self.make_branch_and_tree('tree')
992
991
        tree.branch.get_config().set_user_option('per_file_commits', 'true')