/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-25 13:33:32 UTC
  • Revision ID: v.ladeuil+lp@free.fr-20090825133332-1614tudw25pyqxzz
Fix test failures.

* tests/test_commit.py:
(TestCommitDialog_Commit.test_commit_specific_files_with_messages,
TestCommitDialog_Commit.test_commit_messages_after_merge):
bzrlib.bencode is now stricter and raises TypeError if provided
with Unicode strings. Fix the tests that were too relax anyway.

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/test_commit.py
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('ld7:file_id4:a-id'
992
 
                           '7:message14:Message for A\n'
993
 
                           '4:path1:a'
994
 
                         'ee', 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)
995
996
        self.assertEqual([{'path':'a', 'file_id':'a-id',
996
 
                           'message':'Message for A\n'},
997
 
                         ], bencode.bdecode(file_info))
 
997
                           'message':'Message for A\n'},],
 
998
                         bencode.bdecode(file_info.encode('UTF-8')))
998
999
 
999
1000
    def test_commit_messages_after_merge(self):
1000
1001
        tree = self.make_branch_and_tree('tree')
1021
1022
        self.assertEqual('Merging from "tree2"\n', rev.message)
1022
1023
        self.assertEqual([rev_id1, rev_id2], rev.parent_ids)
1023
1024
        file_info = rev.properties['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)
 
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)
1028
1030
        self.assertEqual([{'path':'a', 'file_id':'a-id',
1029
 
                           'message':'Message for A\n'},
1030
 
                         ], bencode.bdecode(file_info))
 
1031
                           'message':'Message for A\n'},],
 
1032
                         bencode.bdecode(file_info.encode('UTF-8')))
1031
1033
 
1032
1034
    def test_commit_unicode_messages(self):
1033
1035
        self.requireFeature(tests.UnicodeFilenameFeature)