mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-10-31 09:41:08 +00:00
Code Issues 32 Releases Wiki Activity
11,933 Commits 30 Branches 460 Tags
c09f6ff0a58d016eeb7536f1df1fa956f94f671c
Commit Graph

27 Commits

Author SHA1 Message Date
Claude Paroz
3904b74a3f Fixed #18013 -- Use the new 'as' syntax for exceptions. 
Thanks Clueless for the initial patch.
Note that unittest has been purposely left out (external package only used by Python 2.6).
 2012-04-29 20:57:15 +02:00
Aymeric Augustin
800e3941c5 Extended TrailingSlashURLTests to cover STATIC_URL as well as MEDIA_URL. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17846 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-03-31 13:11:02 +00:00
Aymeric Augustin
fbfaa35fb0 Required that the MEDIA_URL and STATIC_URL settings end with a slash, per the deprecation timeline. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17845 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-03-31 13:01:59 +00:00
Aymeric Augustin
eb163f37cb Use the class decorator syntax available in Python >= 2.6. Refs #17965. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17829 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-03-30 09:08:29 +00:00
Claude Paroz
9383a2761c Removed with_statement imports, useless in Python >= 2.6. Refs #17965. Thanks jonash for the patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17828 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-03-30 08:02:08 +00:00
Aymeric Augustin
4b14546215 Fixed #17895 -- Made override_settings send the setting_changed signal both when a setting is overridden and when it's restored. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17708 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-03-13 23:02:31 +00:00
Chris Beaven
3ac0961e1e Don't let ALLOWED_INCLUDE_ROOTS be accidentally set to a string rather than a tuple. Thanks to Florian Apolloner for pointing this out. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17571 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-02-22 00:42:19 +00:00
Adrian Holovaty
61f0aff811 Fixed #14597 -- Added a SECURE_PROXY_SSL_HEADER setting for cases when you're behind a proxy that 'swallows' the fact that a request is HTTPS 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17209 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-12-16 22:06:06 +00:00
Alex Gaynor
8c0eefd066 Convert the remainder of the relative imports in the tests to be absolute imports. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16981 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-10-13 21:34:56 +00:00
Julien Phalip
095dbe8804 Made the tests introduced in r16942 use old-style class decoration to run with Python < 2.6. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16943 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-10-08 11:36:05 +00:00
Carl Meyer
b6ad1afa68 Fixed #17011 - Made override_settings modify a decorated class in-place rather than creating a dynamic subclass, so as to avoid infinite recursion when used with super(). Thanks jsdalton for the report and patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16942 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-10-08 08:16:17 +00:00
Ramiro Morales
2b4341d532 Also copy __module__ to our dynamically created TestCase subclass when override_settings acts as a class decorator. 
Otherwise, an error in e.g. a test in tests/modeltests/proxy_model_inheritance/tests.py
was being reported as:

ERROR: test_table_exists (django.test.utils.ProxyModelInheritanceTests)

Refs #16672 and [16650].

git-svn-id: http://code.djangoproject.com/svn/django/trunk@16722 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-09-04 22:51:53 +00:00
Russell Keith-Magee
0f767f9a99 Fixed #16672 -- Ensure that test classes decorated with @override_setings gets the right name when running the tests. Thanks to Julien Phalip for the report and initial patch 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16650 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-08-23 00:32:35 +00:00
Ramiro Morales
27eb8bbfd0 Made override_settings also work with TransactionTestCase when acting as a class decorator. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16592 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-08-10 22:26:34 +00:00
Jannis Leidel
723b574793 Fixed #16447 -- Stopped using the setting name as the sender parameter for the setting_changed signal. Thanks, Alex Gaynor. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16530 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-07-10 19:35:05 +00:00
Jannis Leidel
3d970762af Fixed naming of test methods for the sake of consistency. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16399 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-06-14 10:35:13 +00:00
Jannis Leidel
a0791b2759 Fixed #16224 -- Fixed override_settings test utility to correctly work with TestCase classes. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16377 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-06-11 20:40:02 +00:00
Jannis Leidel
5dec36de15 Removed a settings test introduced in r16237 that didn't run on Python < 2.6 due to a SyntaxError raise regarding the class decorators. Thanks for the hint, Julien. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16238 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-05-18 12:30:22 +00:00
Jannis Leidel
a3a53e0b73 Fixed #15561 -- Extended test setting override code added in r16165 with a decorator and a signal for setting changes. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16237 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-05-18 12:08:53 +00:00
Ramiro Morales
1d7fa75c97 Fixed #15064 -- Made manage.py honor the existence and value of DJANGO_SETTINGS_MODULE env var. Thanks olau for the report and Shawn Milochik for a patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16222 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-05-13 12:15:52 +00:00
Jannis Leidel
b0d274dbd5 Added missing future imports missed in r16167. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16169 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-05-06 19:49:06 +00:00
Jannis Leidel
0dc6420b3e Added TestCase.settings context manager to easily override settings in test methods. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16165 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-05-06 13:29:24 +00:00
Chris Beaven
d8bfd3955d Fixes #15892 -- Duplicate 'settings' import (and some unused imports) in settings_tests. Thanks Shawn Milo. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16102 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-04-25 05:59:09 +00:00
Russell Keith-Magee
4c468800ee Updates to the test suite to allow for newly deprecated and removed features 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15990 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-04-02 08:44:47 +00:00
Jannis Leidel
544ab30ed7 Fixed #6218 -- Made MEDIA_URL and STATIC_URL require a trailing slash to ensure there is a consistent way to combine paths in templates. Thanks to Michael Toomim, Chris Heisel and Chris Beaven. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15130 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-01-02 01:33:11 +00:00
Russell Keith-Magee
121d2e3678 Fixed #12991 -- Added unittest2 support. Thanks to PaulM for the draft patch, and to Luke, Karen, Justin, Alex, Łukasz Rekucki, and Chuck Harmston for their help testing and reviewing the final patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14139 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-10-11 12:55:17 +00:00
Jacob Kaplan-Moss
85ccad4d61 Fixed the tests I broke with [11824]. 
Note to self: naming a module "settings" is a really good way of screwing things up.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@11828 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-12-12 18:45:43 +00:00