diff options
Diffstat (limited to 'rest_framework/runtests')
| -rwxr-xr-x | rest_framework/runtests/runcoverage.py | 9 | ||||
| -rwxr-xr-x | rest_framework/runtests/runtests.py | 3 | ||||
| -rw-r--r-- | rest_framework/runtests/urls.py | 2 | 
3 files changed, 13 insertions, 1 deletions
diff --git a/rest_framework/runtests/runcoverage.py b/rest_framework/runtests/runcoverage.py index 0ce379eb..bcab1d14 100755 --- a/rest_framework/runtests/runcoverage.py +++ b/rest_framework/runtests/runcoverage.py @@ -8,6 +8,9 @@ Useful tool to run the test suite for rest_framework and generate a coverage rep  # http://code.djangoproject.com/svn/django/trunk/tests/runtests.py  import os  import sys + +# fix sys path so we don't need to setup PYTHONPATH +sys.path.append(os.path.join(os.path.dirname(__file__), "../.."))  os.environ['DJANGO_SETTINGS_MODULE'] = 'rest_framework.runtests.settings'  from coverage import coverage @@ -55,6 +58,12 @@ def main():          if 'compat.py' in files:              files.remove('compat.py') +        # Same applies to template tags module. +        # This module has to include branching on Django versions, +        # so it's never possible for it to have full coverage. +        if 'rest_framework.py' in files: +            files.remove('rest_framework.py') +          cov_files.extend([os.path.join(path, file) for file in files if file.endswith('.py')])      cov.report(cov_files) diff --git a/rest_framework/runtests/runtests.py b/rest_framework/runtests/runtests.py index 138c725b..4a333fb3 100755 --- a/rest_framework/runtests/runtests.py +++ b/rest_framework/runtests/runtests.py @@ -5,6 +5,9 @@  # http://code.djangoproject.com/svn/django/trunk/tests/runtests.py  import os  import sys + +# fix sys path so we don't need to setup PYTHONPATH +sys.path.append(os.path.join(os.path.dirname(__file__), "../.."))  os.environ['DJANGO_SETTINGS_MODULE'] = 'rest_framework.runtests.settings'  from django.conf import settings diff --git a/rest_framework/runtests/urls.py b/rest_framework/runtests/urls.py index 4b7da787..ed5baeae 100644 --- a/rest_framework/runtests/urls.py +++ b/rest_framework/runtests/urls.py @@ -1,7 +1,7 @@  """  Blank URLConf just to keep runtests.py happy.  """ -from django.conf.urls.defaults import * +from rest_framework.compat import patterns  urlpatterns = patterns('',  )  | 
