← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_generate_ids.py

resolve conflicts against trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_generate_ids.py
62
62
        # Test both case squashing and length restriction
63
63
        fid = gen_file_id('A'*50 + '.txt')
64
64
        self.assertStartsWith(fid, 'a'*20 + '-')
65
 
        self.failUnless(len(fid) < 60)
 
65
        self.assertTrue(len(fid) < 60)
66
66
 
67
67
        # restricting length happens after the other actions, so
68
68
        # we preserve as much as possible
69
69
        fid = gen_file_id('\xe5\xb5..aBcd\tefGhijKLMnop\tqrstuvwxyz')
70
70
        self.assertStartsWith(fid, 'abcdefghijklmnopqrst-')
71
 
        self.failUnless(len(fid) < 60)
 
71
        self.assertTrue(len(fid) < 60)
72
72
 
73
73
    def test_file_ids_are_ascii(self):
74
74
        tail = r'-\d{14}-[a-z0-9]{16}-\d+'