Mikhail Korobov avatar 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)

django_coverage/coverage_runner.py

 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):
         """
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.