/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 bzrlib/tests/__init__.py

Merge (hopefully the last time) mainline fixes for 0.15.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/__init__.py
120
120
    import bzrlib.tests.interrepository_implementations
121
121
    import bzrlib.tests.interversionedfile_implementations
122
122
    import bzrlib.tests.intertree_implementations
 
123
    import bzrlib.tests.per_lock
123
124
    import bzrlib.tests.repository_implementations
124
125
    import bzrlib.tests.revisionstore_implementations
125
126
    import bzrlib.tests.tree_implementations
132
133
            bzrlib.tests.interrepository_implementations,
133
134
            bzrlib.tests.interversionedfile_implementations,
134
135
            bzrlib.tests.intertree_implementations,
 
136
            bzrlib.tests.per_lock,
135
137
            bzrlib.tests.repository_implementations,
136
138
            bzrlib.tests.revisionstore_implementations,
137
139
            bzrlib.tests.tree_implementations,
709
711
        return ''.join(difflines)
710
712
 
711
713
    def assertEqual(self, a, b, message=''):
712
 
        if a == b:
713
 
            return
 
714
        try:
 
715
            if a == b:
 
716
                return
 
717
        except UnicodeError, e:
 
718
            # If we can't compare without getting a UnicodeError, then
 
719
            # obviously they are different
 
720
            mutter('UnicodeError: %s', e)
714
721
        if message:
715
722
            message += '\n'
716
723
        raise AssertionError("%snot equal:\na = %s\nb = %s\n"