diff options
| author | Marko Tibold | 2011-12-30 01:37:32 +0100 |
|---|---|---|
| committer | Marko Tibold | 2011-12-30 01:37:32 +0100 |
| commit | 1b28339e5b733a0422c2bcd06b39e289bc98f69b (patch) | |
| tree | 9e766f4f9d9ec596bc0e2702e1bb291b90aa3a93 /djangorestframework/runtests | |
| parent | 91cee26ad89c04a70f33ae334150dd127f900474 (diff) | |
| parent | a0c4dca9462c738aac3c712607997b9bd1f7b2c8 (diff) | |
| download | django-rest-framework-1b28339e5b733a0422c2bcd06b39e289bc98f69b.tar.bz2 | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'djangorestframework/runtests')
| -rw-r--r-- | djangorestframework/runtests/runcoverage.py | 4 | ||||
| -rw-r--r-- | djangorestframework/runtests/runtests.py | 6 | ||||
| -rw-r--r-- | djangorestframework/runtests/settings.py | 2 | ||||
| -rw-r--r-- | djangorestframework/runtests/urls.py | 2 |
4 files changed, 7 insertions, 7 deletions
diff --git a/djangorestframework/runtests/runcoverage.py b/djangorestframework/runtests/runcoverage.py index 6bae02df..ab1b0498 100644 --- a/djangorestframework/runtests/runcoverage.py +++ b/djangorestframework/runtests/runcoverage.py @@ -51,10 +51,10 @@ def main(): # Drop the compat module from coverage, since we're not interested in the coverage # of a module which is specifically for resolving environment dependant imports. - # (Because we'll end up getting different coverage reports for it for each environment) + # (Because we'll end up getting different coverage reports for it for each environment) if 'compat.py' in files: files.remove('compat.py') - + cov_files.extend([os.path.join(path, file) for file in files if file.endswith('.py')]) cov.report(cov_files) diff --git a/djangorestframework/runtests/runtests.py b/djangorestframework/runtests/runtests.py index 1da918f5..9f5cc7aa 100644 --- a/djangorestframework/runtests/runtests.py +++ b/djangorestframework/runtests/runtests.py @@ -16,12 +16,12 @@ from django.test.utils import get_runner def usage(): return """ Usage: python runtests.py [UnitTestClass].[method] - + You can pass the Class name of the `UnitTestClass` you want to test. - + Append a method name if you only want to test a specific method of that class. """ - + def main(): TestRunner = get_runner(settings) diff --git a/djangorestframework/runtests/settings.py b/djangorestframework/runtests/settings.py index 9b3c2c92..07855fa7 100644 --- a/djangorestframework/runtests/settings.py +++ b/djangorestframework/runtests/settings.py @@ -55,7 +55,7 @@ MEDIA_URL = '' # URL prefix for admin media -- CSS, JavaScript and images. Make sure to use a # trailing slash. -# Examples: "http://foo.com/media/", "/media/". +# Examples: "http://foo.com/media/", "/media/". ADMIN_MEDIA_PREFIX = '/media/' # Make this unique, and don't share it with anybody. diff --git a/djangorestframework/runtests/urls.py b/djangorestframework/runtests/urls.py index 45555813..4b7da787 100644 --- a/djangorestframework/runtests/urls.py +++ b/djangorestframework/runtests/urls.py @@ -4,4 +4,4 @@ Blank URLConf just to keep runtests.py happy. from django.conf.urls.defaults import * urlpatterns = patterns('', -)
\ No newline at end of file +) |
