/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: 2009-08-14 07:21:39 UTC
  • mfrom: (657.1.1 trunk)
  • Revision ID: v.ladeuil+lp@free.fr-20090814072139-yqfy1dx582zomboa
https://launchpad.net/bugs/403430
Check gobject.get_application_name availability

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/test_commit.py
91
91
        rev_id4 = tree3.commit('four')
92
92
        rev_id5 = tree3.commit('five')
93
93
        tree.merge_from_branch(tree2.branch)
94
 
        tree.merge_from_branch(tree3.branch, force=True)
 
94
        tree.merge_from_branch(tree3.branch)
95
95
        self.assertEqual([rev_id1, rev_id3, rev_id5], tree.get_parent_ids())
96
96
 
97
97
        pending_revisions = commit.pending_revisions(tree)
271
271
                               committer='Jerry Foo <jerry@foo.com>',
272
272
                               timestamp=1191372278.05,
273
273
                               timezone=+7200)
274
 
        tree.merge_from_branch(tree3.branch, force=True)
 
274
        tree.merge_from_branch(tree3.branch)
275
275
 
276
276
        dlg = commit.CommitDialog(tree)
277
277
        # TODO: assert that the pending box is set to show
988
988
        rev = tree.branch.repository.get_revision(rev_id2)
989
989
        self.assertEqual('Commit just "a"', rev.message)
990
990
        file_info = rev.properties['file-info']
991
 
        self.assertEqual(u'ld7:file_id4:a-id'
992
 
                         '7:message14:Message for A\n'
993
 
                         '4:path1:a'
994
 
                         'ee',
995
 
                         file_info)
 
991
        self.assertEqual('ld7:file_id4:a-id'
 
992
                           '7:message14:Message for A\n'
 
993
                           '4:path1:a'
 
994
                         'ee', file_info)
996
995
        self.assertEqual([{'path':'a', 'file_id':'a-id',
997
 
                           'message':'Message for A\n'},],
998
 
                         bencode.bdecode(file_info.encode('UTF-8')))
 
996
                           'message':'Message for A\n'},
 
997
                         ], bencode.bdecode(file_info))
999
998
 
1000
999
    def test_commit_messages_after_merge(self):
1001
1000
        tree = self.make_branch_and_tree('tree')
1022
1021
        self.assertEqual('Merging from "tree2"\n', rev.message)
1023
1022
        self.assertEqual([rev_id1, rev_id2], rev.parent_ids)
1024
1023
        file_info = rev.properties['file-info']
1025
 
        self.assertEqual(u'ld7:file_id4:a-id'
1026
 
                         '7:message14:Message for A\n'
1027
 
                         '4:path1:a'
1028
 
                         'ee',
1029
 
                         file_info)
 
1024
        self.assertEqual('ld7:file_id4:a-id'
 
1025
                           '7:message14:Message for A\n'
 
1026
                           '4:path1:a'
 
1027
                         'ee', file_info)
1030
1028
        self.assertEqual([{'path':'a', 'file_id':'a-id',
1031
 
                           'message':'Message for A\n'},],
1032
 
                         bencode.bdecode(file_info.encode('UTF-8')))
 
1029
                           'message':'Message for A\n'},
 
1030
                         ], bencode.bdecode(file_info))
1033
1031
 
1034
1032
    def test_commit_unicode_messages(self):
1035
1033
        self.requireFeature(tests.UnicodeFilenameFeature)