← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/TestUtil.py

  • Committer: John Arbash Meinel
  • Date: 2010-08-23 17:54:07 UTC
  • mfrom: (5387 +trunk)
  • mto: This revision was merged to the branch mainline in revision 5390.
  • Revision ID: john@arbash-meinel.com-20100823175407-yomx2h1x5v8amt6w
Merge bzr.dev 5387 in prep for NEWS

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/TestUtil.py
135
135
        >>>         result.addTests([test, test])
136
136
        >>>     return result
137
137
        """
138
 
        basic_tests = super(TestLoader, self).loadTestsFromModule(module)
 
138
        if sys.version_info < (2, 7):
 
139
            basic_tests = super(TestLoader, self).loadTestsFromModule(module)
 
140
        else:
 
141
            # GZ 2010-07-19: Python 2.7 unittest also uses load_tests but with
 
142
            #                a different and incompatible signature
 
143
            basic_tests = super(TestLoader, self).loadTestsFromModule(module,
 
144
                use_load_tests=False)
139
145
        load_tests = getattr(module, "load_tests", None)
140
146
        if load_tests is not None:
141
147
            return load_tests(basic_tests, module, self)