Mikhail Korobov committed 713c4d7

New test runner is fixed for the case when standard django test runner is the original test runner. Python 2.6 deprecation warning about __new__ executed with arguments is also fixed.

Comments (0)

Files changed (1)


 See the License for the specific language governing permissions and
 limitations under the License.
-Changed by Mikhail Korobov.
 import os
     Test runner which displays a code coverage report at the end of the run.
     def __new__(cls, *args, **kwargs):
         Add the original test runner to the front of CoverageRunner's bases,
         if getattr(settings, 'ORIG_TEST_RUNNER', None):
             settings.TEST_RUNNER = settings.ORIG_TEST_RUNNER
             TestRunner = get_runner(settings)
-            cls.__bases__ = (TestRunner,) + cls.__bases__
-        return super(CoverageRunner, cls).__new__(cls, *args, **kwargs)
+            if (TestRunner != DjangoTestSuiteRunner):
+                cls.__bases__ = (TestRunner,) + cls.__bases__
+        return super(CoverageRunner, cls).__new__(cls)
     def _get_app_package(self, app_model_module):