← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/TestUtil.py

  • Committer: Gary van der Merwe
  • Date: 2010-08-02 19:56:52 UTC
  • mfrom: (5050.3.18 2.2)
  • mto: (5050.3.19 2.2)
  • mto: This revision was merged to the branch mainline in revision 5371.
  • Revision ID: garyvdm@gmail.com-20100802195652-o1ppjemhwrr98i61
Merge lp:bzr/2.2.

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
 
        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)
 
138
        basic_tests = super(TestLoader, self).loadTestsFromModule(module)
145
139
        load_tests = getattr(module, "load_tests", None)
146
140
        if load_tests is not None:
147
141
            return load_tests(basic_tests, module, self)