mirror of
https://github.com/django/django.git
synced 2025-10-26 15:16:09 +00:00
http://code.djangoproject.com/svn/django/trunk ........ r5626 | russellm | 2007-07-07 10:16:23 +0800 (Sat, 07 Jul 2007) | 2 lines Added some uncredited authors that worked on the Oracle branch. ........ r5629 | mtredinnick | 2007-07-08 01:15:54 +0800 (Sun, 08 Jul 2007) | 8 lines Changed HttpRequest.path to be a Unicode object. It has already been URL-decoded by the time we see it anyway, so keeping it as a UTF-8 bytestring was causing unnecessary problems. Also added handling for non-ASCII URL fragments in feed creation (the portion that was outside the control of the Feed class was messed up). ........ r5630 | mtredinnick | 2007-07-08 02:24:27 +0800 (Sun, 08 Jul 2007) | 4 lines Fixed #4772 -- Fixed reverse URL creation to work with non-ASCII arguments. Also included a test for non-ASCII strings in URL patterns, although that already worked correctly. ........ r5631 | mtredinnick | 2007-07-08 02:39:23 +0800 (Sun, 08 Jul 2007) | 3 lines Corrected misleading comment from [5619]. Not sure what I was smoking at the time. ........ r5632 | mtredinnick | 2007-07-08 08:39:32 +0800 (Sun, 08 Jul 2007) | 5 lines Fixed reverse URL lookup using functions when the original URL pattern was a string. This is now just as fragile as it was prior to [5609], but works in a few cases that people were relying on, apparently. ........ r5636 | mtredinnick | 2007-07-08 19:22:53 +0800 (Sun, 08 Jul 2007) | 4 lines Fixed #4798-- Made sure that function keyword arguments are strings (for the keywords themselves) when using Unicode URL patterns. ........ r5638 | gwilson | 2007-07-10 10:34:42 +0800 (Tue, 10 Jul 2007) | 2 lines Fixed #4817 -- Removed leading forward slashes from some urlconf examples in the documentation. ........ r5639 | gwilson | 2007-07-10 10:45:11 +0800 (Tue, 10 Jul 2007) | 2 lines Fixed #4814 -- Fixed some whitespace issues in tutorial01, thanks John Shaffer. ........ r5640 | gwilson | 2007-07-10 11:26:26 +0800 (Tue, 10 Jul 2007) | 2 lines Fixed #4812 -- Fixed an octal escape in regular expression that is used in the `isValidEmail` validator, thanks batchman@free.fr. ........ r5641 | mtredinnick | 2007-07-10 20:02:06 +0800 (Tue, 10 Jul 2007) | 3 lines Fixed #4823 -- Fixed a Python 2.3 incompatibility from [5636] (it was even demonstrated by existing tests, so I really screwed this up). ........ r5642 | mtredinnick | 2007-07-10 20:03:36 +0800 (Tue, 10 Jul 2007) | 3 lines Fixed #4804 -- Fixed a problem when validating choice lists with non-ASCII data. Thanks, django@vonposer.de. ........ r5643 | mtredinnick | 2007-07-10 20:33:55 +0800 (Tue, 10 Jul 2007) | 4 lines Fixed #3760 -- Added the ability to manually set feed- and item-level id elements in Atom feeds. This is fully backwards compatible. Based on a patch from spark343@cs.ubc.ca. ........ r5644 | mtredinnick | 2007-07-11 14:55:12 +0800 (Wed, 11 Jul 2007) | 3 lines Fixed #4815 -- Fixed decoding of request parameters when the input encoding is not UTF-8. Thanks, Jordan Dimov. ........ r5645 | mtredinnick | 2007-07-11 15:00:27 +0800 (Wed, 11 Jul 2007) | 3 lines Fixed #4802 -- Updated French translation. Combined contribution from baptiste.goupil@gmail.com and rocherl@club-internet.fr. ........ r5646 | mtredinnick | 2007-07-11 15:12:50 +0800 (Wed, 11 Jul 2007) | 2 lines Fixed #4753 -- Small update to Spanish translation from Mario Gonzalez. ........ r5649 | jacob | 2007-07-12 08:33:44 +0800 (Thu, 12 Jul 2007) | 1 line Fixed #4615: corrected reverse URL resolution examples in tutorial 4. Thanks for the patch, simeonf. ........ r5650 | adrian | 2007-07-12 12:43:29 +0800 (Thu, 12 Jul 2007) | 1 line Added 'New in Django development version' note to docs/syndication_feeds.txt changes from [5643] ........ r5651 | adrian | 2007-07-12 12:44:45 +0800 (Thu, 12 Jul 2007) | 1 line Edited changes to docs/tutorial04.txt from [5649] ........ r5652 | adrian | 2007-07-12 13:23:47 +0800 (Thu, 12 Jul 2007) | 1 line Added helpful error message to SiteManager.get_current() if the user hasn't set SITE_ID ........ r5653 | adrian | 2007-07-12 13:28:04 +0800 (Thu, 12 Jul 2007) | 1 line Added RequestSite class to sites framework ........ r5654 | adrian | 2007-07-12 13:29:32 +0800 (Thu, 12 Jul 2007) | 1 line Improved syndication feed framework to use RequestSite if the sites framework is not installed -- i.e., the sites framework is no longer required to use the syndication feed framework. This is backwards incompatible if anybody has subclassed Feed and overridden __init__(), because the second parameter is now expected to be an HttpRequest object instead of request.path ........ r5658 | russellm | 2007-07-12 15:45:35 +0800 (Thu, 12 Jul 2007) | 2 lines Fixed #4459 -- Added 'raw' argument to save method, to override any pre-save processing, and modified serializers to use a raw-save. This enables serialization of DateFields with auto_now/auto_now_add. Also modified serializers to invoke save() directly on the model baseclass, to avoid any (potentially order-dependent, data modifying) behavior in a custom save() method. ........ r5659 | russellm | 2007-07-12 19:24:16 +0800 (Thu, 12 Jul 2007) | 2 lines Fixed #3770 -- Remove null=True tag from OneToOne serialization test. OneToOne fields can't have a value of null. ........ r5660 | russellm | 2007-07-12 19:27:38 +0800 (Thu, 12 Jul 2007) | 2 lines Fixed #3768 -- Disabled NullBooleanField PK serialization test. We can't and don't test null PK values. ........ r5662 | russellm | 2007-07-12 20:33:24 +0800 (Thu, 12 Jul 2007) | 2 lines Fixed #4837 -- Updated Debian packaging details. Thanks for the suggestion, Yasushi Masuda <whosaysni@gmail.com>. ........ r5663 | russellm | 2007-07-12 20:44:05 +0800 (Thu, 12 Jul 2007) | 2 lines Fixed #4808 -- Added Chilean regions in localflavor. Thanks, Marijn Vriens <marijn@metronomo.cl>. ........ r5664 | russellm | 2007-07-12 20:48:27 +0800 (Thu, 12 Jul 2007) | 2 lines Fixed #4745 -- Updated docs to point out that 0 is not a valid SITE_ID when running the tests. Thanks for the suggestion, Lars Stavholm <stava@telcotec.se>. ........ r5665 | russellm | 2007-07-12 20:50:02 +0800 (Thu, 12 Jul 2007) | 2 lines Fixed #4763 -- Minor typo in cache documentations. Thanks, dan@coffeecode.net. ........ r5666 | russellm | 2007-07-12 20:55:28 +0800 (Thu, 12 Jul 2007) | 2 lines Fixed #4627 -- Added details on MacPorts packaging of Django. Thanks, Paul Bissex. ........ r5667 | russellm | 2007-07-12 21:23:11 +0800 (Thu, 12 Jul 2007) | 2 lines Fixed #4640 -- Fixed import to stringfilter in docs. Proposed solution to move stringfilter into django.template.__init__ introduces a circular import problem. ........ r5668 | russellm | 2007-07-12 21:32:00 +0800 (Thu, 12 Jul 2007) | 2 lines Fixed #4722 -- Clarified discussion about PYTHONPATH in modpython docs. Thanks for the suggestion, Collin Grady <cgrady@the-magi.us>. ........ r5669 | russellm | 2007-07-12 21:37:59 +0800 (Thu, 12 Jul 2007) | 2 lines Fixed #4755 -- Modified newforms MultipleChoiceField to use list comprehension, rather than iteration. ........ r5670 | russellm | 2007-07-12 21:41:27 +0800 (Thu, 12 Jul 2007) | 2 lines Fixed #4764 -- Added reference to Locale middleware in middleware docs. Thanks, dan@coffeecode.net. ........ r5671 | russellm | 2007-07-12 21:55:19 +0800 (Thu, 12 Jul 2007) | 2 lines Fixed #4768 -- Converted timesince and dateformat to use explicit floor division (pre-emptive avoidance of Python 3000 compatibility problem), and removed a redundant millisecond check. Thanks, John Shaffer <jshaffer2112@gmail.com>. ........ r5672 | russellm | 2007-07-12 22:00:13 +0800 (Thu, 12 Jul 2007) | 2 lines Fixed #4775 -- Added some missing Hungarian accents to the urlify.js LATIN_MAP. Thanks, Pistahh <szekeres@iii.hu>. ........ r5673 | russellm | 2007-07-12 22:05:16 +0800 (Thu, 12 Jul 2007) | 2 lines Fixed #4502 -- Clarified reference to view in tutorial. Thanks for the suggestion, Carl Karsten <carl@personnelware.com>. ........ r5674 | russellm | 2007-07-12 22:11:41 +0800 (Thu, 12 Jul 2007) | 2 lines Fixed #4522 -- Clarified the allowed filter arguments on the time and date filters. Thanks for the suggestion, admackin@gmail.com. ........ r5675 | russellm | 2007-07-12 22:21:51 +0800 (Thu, 12 Jul 2007) | 2 lines Fixed #4525 -- Fixed mistaken documentation on arguments to runfcgi. Thanks, Johan Bergstrom <bugs@bergstroem.nu>. ........ r5676 | russellm | 2007-07-12 22:41:32 +0800 (Thu, 12 Jul 2007) | 2 lines Fixed #4538 -- Split the installation instructions to differentiate between installing a distribution package and installing an official release. Thanks to Carl Karsten for the idea, and Paul Bissex for the patch. ........ r5677 | russellm | 2007-07-12 23:26:37 +0800 (Thu, 12 Jul 2007) | 2 lines Fixed #4526 -- Modified the test Client login method to fail when a user is inactive. Thanks, marcin@elksoft.pl. ........ r5678 | russellm | 2007-07-13 13:03:33 +0800 (Fri, 13 Jul 2007) | 2 lines Fixed #3505 -- Added handling for the error raised when the user forgets the comma in a single element tuple when defining AUTHENTICATION_BACKENDS. Thanks for the help identifying this problem, Mario Gonzalez <gonzalemario@gmail.com>. ........ r5679 | mtredinnick | 2007-07-13 16:52:07 +0800 (Fri, 13 Jul 2007) | 3 lines Fixed #2591 -- Fixed a problem with inspectdb with psycopg2 (only). Patch from Gary Wilson. ........ r5680 | mtredinnick | 2007-07-13 17:09:59 +0800 (Fri, 13 Jul 2007) | 3 lines Fixed #4807 -- Fixed a couple of corner cases in decimal form input validation. Based on a suggestion from Chriss Moffit. ........ r5681 | mtredinnick | 2007-07-13 17:14:51 +0800 (Fri, 13 Jul 2007) | 3 lines Fixed #4839 -- Added __repr__ methods to URL classes that show the pattern they contain. Thanks, Thomas G?\195?\188ttler. ........ r5682 | mtredinnick | 2007-07-13 18:56:30 +0800 (Fri, 13 Jul 2007) | 3 lines Fixed #4842 -- Added slightly more robust error reporting. Thanks, Thomas G?\195?\188ttler. ........ r5683 | mtredinnick | 2007-07-13 19:05:01 +0800 (Fri, 13 Jul 2007) | 3 lines Fixed #4846 -- Fixed some Python 2.3 encoding problems in the admin interface. Based on a patch from daybreaker12@gmail.com. ........ r5684 | mtredinnick | 2007-07-13 20:03:20 +0800 (Fri, 13 Jul 2007) | 3 lines Fixed #4861 -- Removed some duplicated logic from the newforms RegexField by making it a subclass of CharField. Thanks, Collin Grady. ........ r5685 | mtredinnick | 2007-07-13 21:15:35 +0800 (Fri, 13 Jul 2007) | 3 lines Fixed #4865 -- Replaced a stray generator comprehension with a list comprehension so that we don't break Python 2.3. ........ r5686 | mtredinnick | 2007-07-13 22:13:35 +0800 (Fri, 13 Jul 2007) | 3 lines Fixed #4469 -- Added slightly more informative error messages to max- and min-length newform validation. Based on a patch from A. Murat Eren. ........ r5687 | mtredinnick | 2007-07-13 22:14:47 +0800 (Fri, 13 Jul 2007) | 2 lines Added author credit for [5686]. Refs #4469. ........ r5688 | mtredinnick | 2007-07-13 22:33:46 +0800 (Fri, 13 Jul 2007) | 3 lines Fixed #4484 -- Fixed APPEND_SLASH handling to handle an empty path value. Thanks, VesselinK. ........ r5689 | mtredinnick | 2007-07-13 22:40:39 +0800 (Fri, 13 Jul 2007) | 2 lines Fixed #4556 -- Stylistic changes to [5500]. Thanks, glin@seznam.cz. ........ r5690 | gwilson | 2007-07-14 04:36:01 +0800 (Sat, 14 Jul 2007) | 2 lines Refs #2591 -- Removed int conversion and try/except since the value in the single-item list is already an int. I overlooked this in my original patch, which was applied in [5679]. ........ r5691 | adrian | 2007-07-14 05:20:07 +0800 (Sat, 14 Jul 2007) | 1 line Documented the 'commit' argument to save() methods on forms created via form_for_model() or form_for_instance() ........ r5692 | mtredinnick | 2007-07-14 13:27:22 +0800 (Sat, 14 Jul 2007) | 3 lines Fixed #4869 -- Added a note that syncdb does not alter existing tables. Thanks, James Bennett. ........ r5693 | mtredinnick | 2007-07-14 20:48:24 +0800 (Sat, 14 Jul 2007) | 3 lines Fixed #4863 -- Removed comment references to a no-longer present link. Pointed out by Thomas G?\195?\188ttler. ........ r5694 | mtredinnick | 2007-07-14 21:14:28 +0800 (Sat, 14 Jul 2007) | 2 lines Fixed #4862 -- Fixed invalid Javascript creation in popup windows in admin. ........ r5695 | mtredinnick | 2007-07-14 21:39:41 +0800 (Sat, 14 Jul 2007) | 2 lines Fixed a problem with translatable strings from [5686]. ........ r5696 | mtredinnick | 2007-07-14 22:47:14 +0800 (Sat, 14 Jul 2007) | 3 lines Fixed #4731 -- Changed management.setup_environ() so that it no longer assumes the settings module is called "settings". Patch from SmileyChris. ........ r5697 | mtredinnick | 2007-07-14 22:50:35 +0800 (Sat, 14 Jul 2007) | 3 lines Fixed #4870 -- Removed unneeded import and fixed a docstring in an example. Thanks, Collin Grady. ........ r5698 | adrian | 2007-07-15 00:58:54 +0800 (Sun, 15 Jul 2007) | 1 line Edited docs/db-api.txt changes from [5658] ........ r5699 | adrian | 2007-07-15 01:04:30 +0800 (Sun, 15 Jul 2007) | 1 line Negligible capitalization fix in test/client.py docstring ........ r5700 | russellm | 2007-07-15 12:41:59 +0800 (Sun, 15 Jul 2007) | 2 lines Clarified the documentation on the steps that happen during a save, and how raw save affects those steps. ........ r5701 | gwilson | 2007-07-15 13:03:28 +0800 (Sun, 15 Jul 2007) | 2 lines Fixed #4310 -- Fixed a regular expression bug in `strip_entities` function and added tests for several `django.utils.html` functions. Based on patch from Brian Harring. ........ r5702 | gwilson | 2007-07-15 13:11:06 +0800 (Sun, 15 Jul 2007) | 2 lines Fixed #4877 -- Fixed typo in testing documentation, patch from John Shaffer. ........ r5703 | gwilson | 2007-07-15 14:24:54 +0800 (Sun, 15 Jul 2007) | 2 lines Fixed #3012 -- Changed the locmem cache backend to use pickle instead of deepcopy to make it compatible with iterators (which cannot be copied). Patch from Sundance. ........ r5704 | gwilson | 2007-07-15 14:29:45 +0800 (Sun, 15 Jul 2007) | 2 lines Changed imports to adhere to PEP 8. ........ r5705 | mtredinnick | 2007-07-15 17:39:13 +0800 (Sun, 15 Jul 2007) | 3 lines Fixed #4880 -- Updated Spanish translation (includes re-encoding to UTF-8). Thanks, Jorge Gajon. ........ r5706 | mtredinnick | 2007-07-15 17:46:42 +0800 (Sun, 15 Jul 2007) | 3 lines Fixed #4882 -- Updated Argentinean Spanish translation (includes re-encoding to UTF-8). Thanks, Ramiro Morales. ........ r5707 | mtredinnick | 2007-07-15 18:08:05 +0800 (Sun, 15 Jul 2007) | 3 lines Re-encoded djangojs.po for French and German locales to UTF-8. These were the last two non-UTF-8 PO files. ........ r5708 | mtredinnick | 2007-07-15 18:10:44 +0800 (Sun, 15 Jul 2007) | 6 lines Fixed #4734 -- Changed message extraction to permit non-ACSII msgid strings. Thanks, krzysiek.pawlik@silvermedia.pl. This is slightly backwards-incompatible for translators: PO files are now assumed to be in UTF-8 encoding. ........ r5709 | adrian | 2007-07-16 03:34:21 +0800 (Mon, 16 Jul 2007) | 1 line Edited docs/db-api.txt changes from [5700] ........ r5710 | adrian | 2007-07-16 05:16:32 +0800 (Mon, 16 Jul 2007) | 1 line Improved docs/templates.txt section on the 'regroup' tag ........ r5711 | mtredinnick | 2007-07-16 11:48:03 +0800 (Mon, 16 Jul 2007) | 2 lines Updated AUTHORS for [5708]. ........ r5712 | mtredinnick | 2007-07-16 11:50:22 +0800 (Mon, 16 Jul 2007) | 3 lines Fixed #4199 -- Changed date formatting in HTTP expires header to be spec compliant. Thanks, Chris Bennett. ........ r5713 | mtredinnick | 2007-07-16 12:45:45 +0800 (Mon, 16 Jul 2007) | 3 lines Fixed #4884 -- Fixed an initialisation problem when assigned to settings before accessing them. Thanks, Noam Raphael. ........ r5714 | mtredinnick | 2007-07-16 12:47:52 +0800 (Mon, 16 Jul 2007) | 2 lines Fixed #4806 -- Updated Simplified Chinese translation. Thanks, limodou. ........ r5715 | mtredinnick | 2007-07-16 12:54:49 +0800 (Mon, 16 Jul 2007) | 3 lines Fixed #4887 -- Fixed another place where template tag arguments are used directly as function keyword args. Thanks, Brian Rosner. ........ r5716 | gwilson | 2007-07-16 13:00:18 +0800 (Mon, 16 Jul 2007) | 2 lines Refs #3012 -- Removed iterator from `test_data_types` cache test that I added in [5703]. Iterators cannot be pickled either. Left the rest of [5703] there though since it fixed another issue that was causing the `test_data_types` cache test to fail with the `locmem` cache backend, the fact that functions cannot be copied. ........ r5717 | gwilson | 2007-07-16 13:28:13 +0800 (Mon, 16 Jul 2007) | 2 lines Cleaned up a couple unused imports and fixed docstrings to follow Python Style Guide. ........ r5718 | mtredinnick | 2007-07-16 17:36:10 +0800 (Mon, 16 Jul 2007) | 3 lines Fixed #4845 -- Fixed some problems with Unicode usage and caching. Thanks, Jeremy Dunck. ........ r5719 | gwilson | 2007-07-16 21:47:43 +0800 (Mon, 16 Jul 2007) | 2 lines Removed unused variable and changed comments about `permalink` decorator into a docstring. ........ r5720 | gwilson | 2007-07-17 06:29:09 +0800 (Tue, 17 Jul 2007) | 2 lines Fixed #4851 -- Fixed description of an example query in `db-api` docs. ........ r5721 | mtredinnick | 2007-07-17 12:22:11 +0800 (Tue, 17 Jul 2007) | 2 lines Fixed #4898 -- Fixed a precendence problem when constructing HTTP Date header. ........ r5722 | mtredinnick | 2007-07-17 18:25:43 +0800 (Tue, 17 Jul 2007) | 3 lines Fixed #4899 -- Fixed a problem with PO file header generation caused by [5708]. Thanks, Ramiro Morales. ........ r5723 | mtredinnick | 2007-07-19 17:23:45 +0800 (Thu, 19 Jul 2007) | 2 lines Fixed #4917 -- Updated Swedish translation. Thanks, Pilip Lindborg. ........ r5724 | mtredinnick | 2007-07-19 17:24:36 +0800 (Thu, 19 Jul 2007) | 2 lines Fixed #3925 -- Added Slovak localflavor items. Thanks, Martin Kos?\195?\173r. ........ r5725 | adrian | 2007-07-20 14:28:56 +0800 (Fri, 20 Jul 2007) | 1 line Added a db_type() method to the database Field class. This is a hook for calculating the database column type for a given Field. Also converted all management.py CREATE TABLE statements to use db_type(), which made that code cleaner. The Field.get_internal_type() hook still exists, but we should consider removing it at some point, because db_type() is more general. Also added docs -- the beginnings of docs on how to create custom database Field classes. This is backwards-compatible. ........ r5726 | adrian | 2007-07-20 14:34:26 +0800 (Fri, 20 Jul 2007) | 1 line Simplified the indent level in management.py _get_sql_model_create() by using a 'continue' statement rather than nesting everything in an 'if' ........ r5727 | russellm | 2007-07-20 20:07:58 +0800 (Fri, 20 Jul 2007) | 2 lines Fixed #4558 -- Modified XML serializer to handle whitespace better around None tags. Thanks to Bill Fenner <fenner@gmail.com> for the report and fix. ........ r5728 | russellm | 2007-07-20 20:15:02 +0800 (Fri, 20 Jul 2007) | 2 lines Fixed #4897 -- Fixed minor typo in doctest comment. ........ r5729 | russellm | 2007-07-20 21:57:49 +0800 (Fri, 20 Jul 2007) | 2 lines Fixed #3782 -- Added support for the suite() method recommended by the Python unittest docs. Thanks for the suggestion, rene.puls@repro-mayr.de. ........ r5730 | russellm | 2007-07-20 22:07:54 +0800 (Fri, 20 Jul 2007) | 2 lines Refs #3782 -- Added documentation note that suite() handling is only in development version. ........ r5731 | russellm | 2007-07-20 22:32:20 +0800 (Fri, 20 Jul 2007) | 2 lines Fixed #4901 -- Modified assertContains to provide a default check of 'any instances of text in content'. Thanks for the suggestion, nis@superlativ.dk. ........ r5732 | russellm | 2007-07-20 22:42:57 +0800 (Fri, 20 Jul 2007) | 2 lines Fixed #4738 -- Modified the prompt that is displayed when a test database cannot be created. The existing prompt was misleading if the issue wasn't a pre-existing database. Thanks for the suggestion, John Shaffer <jshaffer2112@gmail.com>. ........ r5733 | adrian | 2007-07-20 23:40:54 +0800 (Fri, 20 Jul 2007) | 1 line Fixed negligible typo in docstring in tests/regressiontests/test_client_regress/models.py from [5731] ........ r5736 | adrian | 2007-07-21 05:24:30 +0800 (Sat, 21 Jul 2007) | 1 line Added some additional docs to docs/model-api.txt db_type() section ........ r5738 | russellm | 2007-07-21 11:30:38 +0800 (Sat, 21 Jul 2007) | 2 lines Fixed #4304 -- Modified sys.exit to os._exit to make sure development server quits when an error occurs attempting to bind to the requested port (e.g., if another server is already running). Thanks, Mario Gonzalez <gonzalemario@gmail.com>. ........ r5739 | russellm | 2007-07-21 12:36:28 +0800 (Sat, 21 Jul 2007) | 2 lines Minor fix to allow for count=0 in assertContains. ........ r5740 | russellm | 2007-07-21 13:15:19 +0800 (Sat, 21 Jul 2007) | 2 lines Added test cases for change [5739]. ........ r5741 | russellm | 2007-07-21 13:17:20 +0800 (Sat, 21 Jul 2007) | 2 lines Fixed #4402 -- Modified test client to allow multi-valued inputs on GET requests. Thanks for the suggestion, eddymul@gmail.com. ........ r5743 | gwilson | 2007-07-22 10:18:36 +0800 (Sun, 22 Jul 2007) | 2 lines Fixed #4945 -- Removed unused `GET_ITERATOR_CHUNK_SIZE` definition from manager.py. `GET_ITERATOR_CHUNK_SIZE` is already defined in query.py. Thanks zigiDev@mac.com. ........ r5744 | gwilson | 2007-07-22 11:09:24 +0800 (Sun, 22 Jul 2007) | 2 lines Added docstrings to shortcuts module and functions. ........ r5745 | gwilson | 2007-07-22 11:12:50 +0800 (Sun, 22 Jul 2007) | 2 lines Shortcut functions do not accept `QuerySet` objects, yet :) ........ r5746 | gwilson | 2007-07-22 11:41:11 +0800 (Sun, 22 Jul 2007) | 2 lines Fixed #4373 -- Modified the get_object_or_404/get_list_or_404 shortcuts to also accept `QuerySet`s. Thanks SuperJared. ........ r5747 | gwilson | 2007-07-22 11:45:03 +0800 (Sun, 22 Jul 2007) | 2 lines Corrected typo in [5746]. ........ r5750 | gwilson | 2007-07-23 12:45:01 +0800 (Mon, 23 Jul 2007) | 2 lines Fixed #4952 -- Fixed the `get_template_sources` functions of the `app_directories` and `filesystem` template loaders to not return paths outside of given template directories. Both functions now make use of a new `safe_join` utility function. Thanks to SmileyChris for help with the patch. ........ r5752 | russellm | 2007-07-23 20:14:32 +0800 (Mon, 23 Jul 2007) | 2 lines Fixed #3771 -- Modified the test runner to observe the --noinput argument controlling script interactivity. This means that test scripts can now be put in a buildbot environment. This is a backwards incompatible change for anyone that has written a custom test runner. Thanks for the suggestion, moof@metamoof.net. ........ r5753 | russellm | 2007-07-23 21:52:59 +0800 (Mon, 23 Jul 2007) | 2 lines Added documentation for a test runner argument that has always been present, but was undocumented. ........ r5756 | adrian | 2007-07-25 11:12:31 +0800 (Wed, 25 Jul 2007) | 1 line Changed docstring additions from [5744] to use active verbs ('returns' instead of 'return') ........ r5757 | adrian | 2007-07-25 11:15:05 +0800 (Wed, 25 Jul 2007) | 1 line Added 'New in Django development version' to docs/db-api.txt change from [5746] ........ r5758 | adrian | 2007-07-25 11:18:17 +0800 (Wed, 25 Jul 2007) | 1 line Changed safe_join() docstring from [5750] to use active verbs. See also [5756] ........ r5764 | gwilson | 2007-07-26 13:01:53 +0800 (Thu, 26 Jul 2007) | 2 lines Fixed #4971 -- Fixed some escaping and quoting problems in the databrowse contrib app. Based on patch from Johann Queuniet. ........ r5765 | adrian | 2007-07-27 01:16:34 +0800 (Fri, 27 Jul 2007) | 1 line Added section to docs/contributing.txt about docstring coding style ........ r5766 | mtredinnick | 2007-07-27 06:59:34 +0800 (Fri, 27 Jul 2007) | 2 lines Added support for database cache table in test database. ........ r5767 | adrian | 2007-07-28 05:53:02 +0800 (Sat, 28 Jul 2007) | 1 line Added unit test that confirms a bug in ValuesQuerySets that have extra(select) specified. If the select dictionary has several fields, Django assigns the wrong values to the select-field names ........ r5768 | adrian | 2007-07-28 06:07:42 +0800 (Sat, 28 Jul 2007) | 1 line Fixed bug with using values() and extra(select) in the same QuerySet, with a select dictionary containing more than a few elements. This bug was identified in unit test from [5767]. The problem was that we were relying on the dictionary's .items() ordering, which is undefined ........ r5769 | russellm | 2007-07-28 12:02:52 +0800 (Sat, 28 Jul 2007) | 2 lines Fixed #4460 -- Added the ability to be more specific in the test cases that are executed. This is a backwards incompatible change for any user with a custom test runner. See the wiki for details. ........ r5770 | russellm | 2007-07-28 15:27:53 +0800 (Sat, 28 Jul 2007) | 2 lines Fixed #4995 -- Fixed some problems in documentation ReST formatting. Thanks, Simon G. ........ r5771 | simon | 2007-07-29 02:30:40 +0800 (Sun, 29 Jul 2007) | 1 line After discussing with Malcolm, added set_unusable_password() and has_usable_password() methods to the User object, plus tests and updated documentation ........ r5774 | adrian | 2007-07-30 02:21:16 +0800 (Mon, 30 Jul 2007) | 1 line Added 'New in Django development version' to changes in docs/authentication.txt from [5771] ........ r5778 | gwilson | 2007-07-31 01:25:35 +0800 (Tue, 31 Jul 2007) | 4 lines Fixed call to `ugettext`, which is imported as `_`. Changed raise to conform to PEP 3109 and wrapped the long line. Added beginnings of tests for model fields. ........ r5782 | gwilson | 2007-08-01 13:41:32 +0800 (Wed, 01 Aug 2007) | 2 lines Fixed #4228 -- Removed hardcoding of `RadioFieldRenderer` in the `RadioSelect` Widget so that the display of `RadioSelect`s can be more easily customized. `BoundField.__unicode__` also no longer special cases `RadioSelect` since `RadioSelect.render()` now returns a string like every other Widget. ........ r5783 | gwilson | 2007-08-01 13:52:18 +0800 (Wed, 01 Aug 2007) | 2 lines Fixed #5037 -- Fixed use of wrong field type in a db-api docs example, thanks ubernostrum. ........ r5796 | gwilson | 2007-08-04 11:19:14 +0800 (Sat, 04 Aug 2007) | 2 lines Fixed #5078 -- Fixed several broken links to the syndication documentation. ........ r5797 | gwilson | 2007-08-04 11:36:58 +0800 (Sat, 04 Aug 2007) | 2 lines Changed the 0.95 release notes to point to the 0.95 documentation index. ........ r5798 | gwilson | 2007-08-04 11:39:24 +0800 (Sat, 04 Aug 2007) | 2 lines Changed several documentation links to be relative. ........ r5799 | gwilson | 2007-08-04 22:41:49 +0800 (Sat, 04 Aug 2007) | 2 lines Refs #3397 -- Corrected the Exception that is caught when ordering by non-fields (added in [4596]), thanks glin@seznam.cz. ........ r5800 | gwilson | 2007-08-04 22:52:13 +0800 (Sat, 04 Aug 2007) | 2 lines Fixed #5083 -- Fixed typo in newforms documentation, thanks Rik. ........ r5801 | gwilson | 2007-08-05 12:39:52 +0800 (Sun, 05 Aug 2007) | 2 lines Refs #5089 -- Added file name to poll detail template examples in the tutorial. ........ r5802 | gwilson | 2007-08-05 12:42:26 +0800 (Sun, 05 Aug 2007) | 2 lines Changed some more links to be relative in the documentation. I had a couple unsaved files that didn't get in with [5798]. ........ r5803 | gwilson | 2007-08-05 13:14:46 +0800 (Sun, 05 Aug 2007) | 2 lines Fixed #2101 -- Renamed `maxlength` argument to `max_length` for oldforms `FormField`s and db model `Field`s. This is fully backwards compatible at the moment since the legacy `maxlength` argument is still supported. Using `maxlength` will, however, issue a `PendingDeprecationWarning` when used. ........ r5804 | russellm | 2007-08-05 15:39:36 +0800 (Sun, 05 Aug 2007) | 2 lines Fixed #4001 -- Added dynamic save_m2m method() to forms created with form_for_model and form_for_instance on save(commit=False). ........ r5807 | adrian | 2007-08-06 12:36:43 +0800 (Mon, 06 Aug 2007) | 1 line Fixed #5074 -- Added link to audio clip of 'Django' pronunciation ........ r5808 | adrian | 2007-08-06 12:52:14 +0800 (Mon, 06 Aug 2007) | 1 line Edited docs/newforms.txt changes from [5804] ........ r5809 | adrian | 2007-08-06 13:04:27 +0800 (Mon, 06 Aug 2007) | 1 line Fixed #5082 -- Enabled tab completion in 'django-admin.py shell' for objects that were imported into the global namespace at runtime. Thanks, dusk@woofle.net ........ r5810 | adrian | 2007-08-06 13:06:15 +0800 (Mon, 06 Aug 2007) | 1 line Fixed #5077 -- django/utils/encoding.py no longer imports settings, as it doesn't use that module. Thanks, Collin Grady ........ r5811 | adrian | 2007-08-06 13:07:38 +0800 (Mon, 06 Aug 2007) | 1 line Fixed #5071 -- Fixed 'global name ugettext is not defined' error in django.core.validators. Thanks, Marco Bonetti ........ r5812 | adrian | 2007-08-06 13:13:06 +0800 (Mon, 06 Aug 2007) | 1 line Fixed #5064 -- Fixed potentially confusing sentence in docs/authentication.txt. Thanks, Collin Grady ........ r5813 | adrian | 2007-08-06 13:16:35 +0800 (Mon, 06 Aug 2007) | 1 line Fixed #5053 -- Added 'action' attribute to <form> tags that didn't have that attribute in docs/newforms.txt examples. Perfectionism appreciated, trickyb ........ r5814 | adrian | 2007-08-06 13:27:58 +0800 (Mon, 06 Aug 2007) | 1 line Added a closing </p>' to a code example in docs/email.txt ........ r5815 | adrian | 2007-08-06 13:28:45 +0800 (Mon, 06 Aug 2007) | 1 line Fixed #5006 -- Fixed incorrect/outdated docstring for the 'if' template tag. Thanks, Thomas Petazzoni ........ r5816 | adrian | 2007-08-06 13:33:18 +0800 (Mon, 06 Aug 2007) | 1 line Added note to docs/model-api.txt about help_text not being escaped in the admin interface ........ r5817 | adrian | 2007-08-06 13:34:45 +0800 (Mon, 06 Aug 2007) | 1 line Fixed #4985 -- Clarified location of HttpResponse in docs/request_response.txt. Thanks for raising the issue, rainer.mansfeld@romulo.de ........ r5818 | adrian | 2007-08-06 13:37:17 +0800 (Mon, 06 Aug 2007) | 1 line Fixed #4980 -- Removed 'forms' from the 'not considered stable and will be rewritten' section of docs/api_stability.txt. They've already been rewritten. ........ r5819 | russellm | 2007-08-06 21:58:56 +0800 (Mon, 06 Aug 2007) | 2 lines Fixed #3297 -- Implemented FileField and ImageField for newforms. Thanks to the many users that contributed to and tested this patch. ........ r5820 | russellm | 2007-08-06 22:17:10 +0800 (Mon, 06 Aug 2007) | 2 lines Added note that FileField and ImageField are only in development version. There are also some minor backwards compatibility issues with the changes introduced in [5819] - see the wiki for details. ........ r5823 | adrian | 2007-08-07 04:27:04 +0800 (Tue, 07 Aug 2007) | 1 line Fixed British spelling of 'customize' and 'behavior' in Manager.get_query_set() docstring ........ r5824 | adrian | 2007-08-07 10:18:36 +0800 (Tue, 07 Aug 2007) | 1 line Fixed #5105 -- Fixed two ReST errors in docs/newforms.txt. Thanks, Ramiro Morales ........ r5825 | adrian | 2007-08-07 10:33:11 +0800 (Tue, 07 Aug 2007) | 1 line Fixed #5097 -- Made various updates and corrections to the documentation. Thanks, Nicola Larosa ........ r5826 | russellm | 2007-08-07 19:20:15 +0800 (Tue, 07 Aug 2007) | 2 lines Removed a redundant directory join during FileField form saving. Thanks to David Danier's eagle eyes for picking up this one. ........ git-svn-id: http://code.djangoproject.com/svn/django/branches/newforms-admin@5828 bcc190cf-cafb-0310-a4f2-bffc1f526a37
746 lines
30 KiB
Plaintext
746 lines
30 KiB
Plaintext
===========================
|
|
Testing Django applications
|
|
===========================
|
|
|
|
Automated testing is an extremely useful bug-killing tool for the modern
|
|
Web developer. You can use a collection of tests -- a **test suite** -- to
|
|
solve, or avoid, a number of problems:
|
|
|
|
* When you're writing new code, you can use tests to validate your code
|
|
works as expected.
|
|
|
|
* When you're refactoring or modifying old code, you can use tests to
|
|
ensure your changes haven't affected your application's behavior
|
|
unexpectedly.
|
|
|
|
Testing a Web application is a complex task, because a Web application is made
|
|
of several layers of logic -- from HTTP-level request handling, to form
|
|
validation and processing, to template rendering. With Django's test-execution
|
|
framework and assorted utilities, you can simulate requests, insert test data,
|
|
inspect your application's output and generally verify your code is doing what
|
|
it should be doing.
|
|
|
|
The best part is, it's really easy.
|
|
|
|
.. admonition:: Note
|
|
|
|
This testing framework is currently under development. It may change
|
|
slightly before the next official Django release.
|
|
|
|
(That's *no* excuse not to write tests, though!)
|
|
|
|
Writing tests
|
|
=============
|
|
|
|
Tests in Django come in two forms: doctests and unit tests.
|
|
|
|
Writing doctests
|
|
----------------
|
|
|
|
Doctests use Python's standard doctest_ module, which searches for tests in
|
|
your docstrings. Django's test runner looks for doctests in your ``models.py``
|
|
file, and executes any that it finds. Django will also search for a file
|
|
called ``tests.py`` in the application directory (i.e., the directory that
|
|
holds ``models.py``). If a ``tests.py`` is found, it will also be searched
|
|
for doctests.
|
|
|
|
.. admonition:: What's a **docstring**?
|
|
|
|
A good explanation of docstrings (and some guidlines for using them
|
|
effectively) can be found in :PEP:`257`:
|
|
|
|
A docstring is a string literal that occurs as the first statement in
|
|
a module, function, class, or method definition. Such a docstring
|
|
becomes the ``__doc__`` special attribute of that object.
|
|
|
|
Since tests often make great documentation, doctest lets you put your
|
|
tests directly in your docstrings.
|
|
|
|
You can put doctest strings on any object in your ``models.py``, but it's
|
|
common practice to put application-level doctests in the module docstring, and
|
|
model-level doctests in the docstring for each model.
|
|
|
|
For example::
|
|
|
|
from django.db import models
|
|
|
|
class Animal(models.Model):
|
|
"""
|
|
An animal that knows how to make noise
|
|
|
|
# Create some animals
|
|
>>> lion = Animal.objects.create(name="lion", sound="roar")
|
|
>>> cat = Animal.objects.create(name="cat", sound="meow")
|
|
|
|
# Make 'em speak
|
|
>>> lion.speak()
|
|
'The lion says "roar"'
|
|
>>> cat.speak()
|
|
'The cat says "meow"'
|
|
"""
|
|
|
|
name = models.CharField(max_length=20)
|
|
sound = models.CharField(max_length=20)
|
|
|
|
def speak(self):
|
|
return 'The %s says "%s"' % (self.name, self.sound)
|
|
|
|
When you `run your tests`_, the test utility will find this docstring, notice
|
|
that portions of it look like an interactive Python session, and execute those
|
|
lines while checking that the results match.
|
|
|
|
For more details about how doctest works, see the `standard library
|
|
documentation for doctest`_
|
|
|
|
.. _doctest: http://docs.python.org/lib/module-doctest.html
|
|
.. _standard library documentation for doctest: doctest_
|
|
|
|
Writing unittests
|
|
-----------------
|
|
|
|
Like doctests, Django's unit tests use a standard library module: unittest_.
|
|
As with doctests, Django's test runner looks for any unit test cases defined
|
|
in ``models.py``, or in a ``tests.py`` file stored in the application
|
|
directory.
|
|
|
|
An equivalent unittest test case for the above example would look like::
|
|
|
|
import unittest
|
|
from myapp.models import Animal
|
|
|
|
class AnimalTestCase(unittest.TestCase):
|
|
|
|
def setUp(self):
|
|
self.lion = Animal.objects.create(name="lion", sound="roar")
|
|
self.cat = Animal.objects.create(name="cat", sound="meow")
|
|
|
|
def testSpeaking(self):
|
|
self.assertEquals(self.lion.speak(), 'The lion says "roar"')
|
|
self.assertEquals(self.cat.speak(), 'The cat says "meow"')
|
|
|
|
When you `run your tests`_, the default behavior of the test utility is
|
|
to find all the test cases (that is, subclasses of ``unittest.TestCase``)
|
|
in ``models.py`` and ``tests.py``, automatically build a test suite out of
|
|
those test cases, and run that suite.
|
|
|
|
**New in Django development version**
|
|
|
|
However, if you define a method called ``suite()`` in either ``models.py`` or
|
|
``tests.py``, that method will be used to construct the test suite for that
|
|
module. This follows the `suggested organization`_ for unit tests. See the
|
|
Python documentation for more details on how to construct a complex test
|
|
suite.
|
|
|
|
For more details about ``unittest``, see the `standard library unittest
|
|
documentation`_.
|
|
|
|
.. _unittest: http://docs.python.org/lib/module-unittest.html
|
|
.. _standard library unittest documentation: unittest_
|
|
.. _run your tests: `Running tests`_
|
|
.. _suggested organization: http://docs.python.org/lib/organizing-tests.html
|
|
|
|
Which should I use?
|
|
-------------------
|
|
|
|
Choosing a test framework is often contentious, so Django simply supports
|
|
both of the standard Python test frameworks. Choosing one is up to each
|
|
developer's personal tastes; each is supported equally. Since each test
|
|
system has different benefits, the best approach is probably to use both
|
|
together, picking the test system to match the type of tests you need to
|
|
write.
|
|
|
|
For developers new to testing, however, this choice can seem
|
|
confusing, so here are a few key differences to help you decide whether
|
|
doctests or unit tests are right for you.
|
|
|
|
If you've been using Python for a while, ``doctest`` will probably feel more
|
|
"pythonic". It's designed to make writing tests as easy as possible, so
|
|
there's no overhead of writing classes or methods; you simply put tests in
|
|
docstrings. This gives the added advantage of giving your modules automatic
|
|
documentation -- well-written doctests can kill both the documentation and the
|
|
testing bird with a single stone.
|
|
|
|
For developers just getting started with testing, using doctests will probably
|
|
get you started faster.
|
|
|
|
The ``unittest`` framework will probably feel very familiar to developers
|
|
coming from Java. Since ``unittest`` is inspired by Java's JUnit, if
|
|
you've used testing frameworks in other languages that similarly were
|
|
inspired by JUnit, ``unittest`` should also feel pretty familiar.
|
|
|
|
Since ``unittest`` is organized around classes and methods, if you need
|
|
to write a bunch of tests that all share similar code, you can easily use
|
|
subclass to abstract common tasks; this makes test code shorter and cleaner.
|
|
There's also support for explicit setup and/or cleanup routines, which give
|
|
you a high level of control over the environment your test cases run in.
|
|
|
|
Again, remember that you can use both systems side-by-side (even in the same
|
|
app). In the end, most projects will eventually end up using both; each shines
|
|
in different circumstances.
|
|
|
|
Testing Tools
|
|
=============
|
|
|
|
To assist in testing various features of your application, Django provides
|
|
tools that can be used to establish tests and test conditions.
|
|
|
|
* `Test Client`_
|
|
* `TestCase`_
|
|
* `E-mail services`_
|
|
|
|
Test Client
|
|
-----------
|
|
|
|
The Test Client is a simple dummy browser. It allows you to simulate
|
|
GET and POST requests on a URL, and observe the response that is received.
|
|
This allows you to test that the correct view is executed for a given URL,
|
|
and that the view constructs the correct response.
|
|
|
|
As the response is generated, the Test Client gathers details on the
|
|
Template and Context objects that were used to generate the response. These
|
|
Templates and Contexts are then provided as part of the response, and can be
|
|
used as test conditions.
|
|
|
|
.. admonition:: Test Client vs Browser Automation?
|
|
|
|
The Test Client is not intended as a replacement for Twill_, Selenium_,
|
|
or other browser automation frameworks - it is intended to allow
|
|
testing of the contexts and templates produced by a view,
|
|
rather than the HTML rendered to the end-user.
|
|
|
|
A comprehensive test suite should use a combination of both: Test Client
|
|
tests to establish that the correct view is being called and that
|
|
the view is collecting the correct context data, and Browser Automation
|
|
tests to check that user interface behaves as expected.
|
|
|
|
.. _Twill: http://twill.idyll.org/
|
|
.. _Selenium: http://www.openqa.org/selenium/
|
|
|
|
Making requests
|
|
~~~~~~~~~~~~~~~
|
|
|
|
Creating an instance of ``Client`` (``django.test.client.Client``) requires
|
|
no arguments at time of construction. Once constructed, the following methods
|
|
can be invoked on the ``Client`` instance.
|
|
|
|
``get(path, data={})``
|
|
Make a GET request on the provided ``path``. The key-value pairs in the
|
|
data dictionary will be used to create a GET data payload. For example::
|
|
|
|
c = Client()
|
|
c.get('/customers/details/', {'name':'fred', 'age':7})
|
|
|
|
will result in the evaluation of a GET request equivalent to::
|
|
|
|
http://yoursite.com/customers/details/?name=fred&age=7
|
|
|
|
``post(path, data={}, content_type=MULTIPART_CONTENT)``
|
|
Make a POST request on the provided ``path``. If you provide a content type
|
|
(e.g., ``text/xml`` for an XML payload), the contents of ``data`` will be
|
|
sent as-is in the POST request, using the content type in the HTTP
|
|
``Content-Type`` header.
|
|
|
|
If you do not provide a value for ``content_type``, the values in
|
|
``data`` will be transmitted with a content type of ``multipart/form-data``.
|
|
The key-value pairs in the data dictionary will be encoded as a multipart
|
|
message and used to create the POST data payload.
|
|
|
|
To submit multiple values for a given key (for example, to specify
|
|
the selections for a multiple selection list), provide the values as a
|
|
list or tuple for the required key. For example, a data dictionary of
|
|
``{'choices': ('a','b','d')}`` would submit three selected rows for the
|
|
field named ``choices``.
|
|
|
|
Submitting files is a special case. To POST a file, you need only
|
|
provide the file field name as a key, and a file handle to the file you wish to
|
|
upload as a value. The Test Client will populate the two POST fields (i.e.,
|
|
``field`` and ``field_file``) required by Django's FileField. For example::
|
|
|
|
c = Client()
|
|
f = open('wishlist.doc')
|
|
c.post('/customers/wishes/', {'name':'fred', 'attachment':f})
|
|
f.close()
|
|
|
|
will result in the evaluation of a POST request on ``/customers/wishes/``,
|
|
with a POST dictionary that contains ``name``, ``attachment`` (containing the
|
|
file name), and ``attachment_file`` (containing the file data). Note that you
|
|
need to manually close the file after it has been provided to the POST.
|
|
|
|
``login(**credentials)``
|
|
**New in Django development version**
|
|
|
|
On a production site, it is likely that some views will be protected from
|
|
anonymous access through the use of the @login_required decorator, or some
|
|
other login checking mechanism. The ``login()`` method can be used to
|
|
simulate the effect of a user logging into the site. As a result of calling
|
|
this method, the Client will have all the cookies and session data required
|
|
to pass any login-based tests that may form part of a view.
|
|
|
|
In most cases, the ``credentials`` required by this method are the username
|
|
and password of the user that wants to log in, provided as keyword
|
|
arguments::
|
|
|
|
c = Client()
|
|
c.login(username='fred', password='secret')
|
|
# Now you can access a login protected view
|
|
|
|
If you are using a different authentication backend, this method may
|
|
require different credentials.
|
|
|
|
``login()`` returns ``True`` if it the credentials were accepted and login
|
|
was successful.
|
|
|
|
Note that since the test suite will be executed using the test database,
|
|
which contains no users by default. As a result, logins that are valid
|
|
on your production site will not work under test conditions. You will
|
|
need to create users as part of the test suite (either manually, or
|
|
using a test fixture).
|
|
|
|
Testing Responses
|
|
~~~~~~~~~~~~~~~~~
|
|
|
|
The ``get()`` and ``post()`` methods both return a Response object. This
|
|
Response object has the following properties that can be used for testing
|
|
purposes:
|
|
|
|
=============== ==========================================================
|
|
Property Description
|
|
=============== ==========================================================
|
|
``status_code`` The HTTP status of the response. See RFC2616_ for a
|
|
full list of HTTP status codes.
|
|
|
|
``content`` The body of the response. This is the final page
|
|
content as rendered by the view, or any error message
|
|
(such as the URL for a 302 redirect).
|
|
|
|
``template`` The Template instance that was used to render the final
|
|
content. Testing ``template.name`` can be particularly
|
|
useful; if the template was loaded from a file,
|
|
``template.name`` will be the file name that was loaded.
|
|
|
|
If multiple templates were rendered, (e.g., if one
|
|
template includes another template),``template`` will
|
|
be a list of Template objects, in the order in which
|
|
they were rendered.
|
|
|
|
``context`` The Context that was used to render the template that
|
|
produced the response content.
|
|
|
|
As with ``template``, if multiple templates were rendered
|
|
``context`` will be a list of Context objects, stored in
|
|
the order in which they were rendered.
|
|
=============== ==========================================================
|
|
|
|
.. _RFC2616: http://www.w3.org/Protocols/rfc2616/rfc2616-sec10.html
|
|
|
|
Exceptions
|
|
~~~~~~~~~~
|
|
|
|
If you point the Test Client at a view that raises an exception, that exception
|
|
will be visible in the test case. You can then use a standard ``try...catch``
|
|
block, or ``unittest.TestCase.assertRaises()`` to test for exceptions.
|
|
|
|
The only exceptions that are not visible in a Test Case are ``Http404``,
|
|
``PermissionDenied`` and ``SystemExit``. Django catches these exceptions
|
|
internally and converts them into the appropriate HTTP responses codes.
|
|
|
|
Persistent state
|
|
~~~~~~~~~~~~~~~~
|
|
|
|
The Test Client is stateful; if a cookie is returned as part of a response,
|
|
that cookie is provided as part of the next request issued by that Client
|
|
instance. Expiry policies for these cookies are not followed; if you want
|
|
a cookie to expire, either delete it manually or create a new Client
|
|
instance (which will effectively delete all cookies).
|
|
|
|
There are two properties of the Test Client which are used to store persistent
|
|
state information. If necessary, these properties can be interrogated as
|
|
part of a test condition.
|
|
|
|
=============== ==========================================================
|
|
Property Description
|
|
=============== ==========================================================
|
|
``cookies`` A Python ``SimpleCookie`` object, containing the current
|
|
values of all the client cookies.
|
|
|
|
``session`` A dictionary-like object containing session information.
|
|
See the `session documentation`_ for full details.
|
|
=============== ==========================================================
|
|
|
|
.. _`session documentation`: ../sessions/
|
|
|
|
Example
|
|
~~~~~~~
|
|
|
|
The following is a simple unit test using the Test Client::
|
|
|
|
import unittest
|
|
from django.test.client import Client
|
|
|
|
class SimpleTest(unittest.TestCase):
|
|
def setUp(self):
|
|
# Every test needs a client
|
|
self.client = Client()
|
|
def test_details(self):
|
|
# Issue a GET request
|
|
response = self.client.get('/customer/details/')
|
|
|
|
# Check that the respose is 200 OK
|
|
self.failUnlessEqual(response.status_code, 200)
|
|
# Check that the rendered context contains 5 customers
|
|
self.failUnlessEqual(len(response.context['customers']), 5)
|
|
|
|
TestCase
|
|
--------
|
|
|
|
Normal python unit tests extend a base class of ``unittest.testCase``.
|
|
Django provides an extension of this base class - ``django.test.TestCase``
|
|
- that provides some additional capabilities that can be useful for
|
|
testing web sites.
|
|
|
|
Moving from a normal unittest TestCase to a Django TestCase is easy - just
|
|
change the base class of your test from ``unittest.TestCase`` to
|
|
``django.test.TestCase``. All of the standard Python unit test facilities
|
|
will continue to be available, but they will be augmented with some useful
|
|
extra facilities.
|
|
|
|
Default Test Client
|
|
~~~~~~~~~~~~~~~~~~~
|
|
**New in Django development version**
|
|
|
|
Every test case in a ``django.test.TestCase`` instance has access to an
|
|
instance of a Django `Test Client`_. This Client can be accessed as
|
|
``self.client``. This client is recreated for each test.
|
|
|
|
Fixture loading
|
|
~~~~~~~~~~~~~~~
|
|
|
|
A test case for a database-backed website isn't much use if there isn't any
|
|
data in the database. To make it easy to put test data into the database,
|
|
Django provides a fixtures framework.
|
|
|
|
A *Fixture* is a collection of files that contain the serialized contents of
|
|
the database. Each fixture has a unique name; however, the files that
|
|
comprise the fixture can be distributed over multiple directories, in
|
|
multiple applications.
|
|
|
|
.. note::
|
|
If you have synchronized a Django project, you have already experienced
|
|
the use of one fixture -- the ``initial_data`` fixture. Every time you
|
|
synchronize the database, Django installs the ``initial_data`` fixture.
|
|
This provides a mechanism to populate a new database with any initial
|
|
data (such as a default set of categories). Fixtures with other names
|
|
can be installed manually using ``django-admin.py loaddata``.
|
|
|
|
However, for the purposes of unit testing, each test must be able to
|
|
guarantee the contents of the database at the start of each and every
|
|
test.
|
|
|
|
To define a fixture for a test, all you need to do is add a class
|
|
attribute to your test describing the fixtures you want the test to use.
|
|
For example, the test case from `Writing unittests`_ would
|
|
look like::
|
|
|
|
from django.test import TestCase
|
|
from myapp.models import Animal
|
|
|
|
class AnimalTestCase(TestCase):
|
|
fixtures = ['mammals.json', 'birds']
|
|
|
|
def setUp(self):
|
|
# test definitions as before
|
|
|
|
def testFluffyAnimals(self):
|
|
# A test that uses the fixtures
|
|
|
|
At the start of each test case, before ``setUp()`` is run, Django will
|
|
flush the database, returning the database the state it was in directly
|
|
after ``syncdb`` was called. Then, all the named fixtures are installed.
|
|
In this example, any JSON fixture called ``mammals``, and any fixture
|
|
named ``birds`` will be installed. See the documentation on
|
|
`loading fixtures`_ for more details on defining and installing fixtures.
|
|
|
|
.. _`loading fixtures`: ../django-admin/#loaddata-fixture-fixture
|
|
|
|
This flush/load procedure is repeated for each test in the test case, so you
|
|
can be certain that the outcome of a test will not be affected by
|
|
another test, or the order of test execution.
|
|
|
|
Emptying the test outbox
|
|
~~~~~~~~~~~~~~~~~~~~~~~~
|
|
**New in Django development version**
|
|
|
|
At the start of each test case, in addition to installing fixtures,
|
|
Django clears the contents of the test e-mail outbox.
|
|
|
|
For more detail on e-mail services during tests, see `E-mail services`_.
|
|
|
|
Assertions
|
|
~~~~~~~~~~
|
|
**New in Django development version**
|
|
|
|
Normal Python unit tests have a wide range of assertions, such as
|
|
``assertTrue`` and ``assertEquals`` that can be used to validate behavior.
|
|
``django.TestCase`` adds to these, providing some assertions
|
|
that can be useful in testing the behavior of web sites.
|
|
|
|
``assertContains(response, text, count=None, status_code=200)``
|
|
Assert that a response indicates that a page could be retrieved and
|
|
produced the nominated status code, and that ``text`` in the content
|
|
of the response. If ``count`` is provided, ``text`` must occur exactly
|
|
``count`` times in the response.
|
|
|
|
``assertFormError(response, form, field, errors)``
|
|
Assert that a field on a form raised the provided list of errors when
|
|
rendered on the form.
|
|
|
|
``form`` is the name the form object was given in the template context.
|
|
|
|
``field`` is the name of the field on the form to check. If ``field``
|
|
has a value of ``None``, non-field errors will be checked.
|
|
|
|
``errors`` is an error string, or a list of error strings, that are
|
|
expected as a result of form validation.
|
|
|
|
``assertTemplateNotUsed(response, template_name)``
|
|
Assert that the template with the given name was *not* used in rendering
|
|
the response.
|
|
|
|
``assertRedirects(response, expected_path, status_code=302, target_status_code=200)``
|
|
Assert that the response received produced the nominated status code,
|
|
redirects the browser to the provided path, and that retrieving the provided
|
|
path yields a response with the target status code.
|
|
|
|
``assertTemplateUsed(response, template_name)``
|
|
Assert that the template with the given name was used in rendering the
|
|
response.
|
|
|
|
E-mail services
|
|
---------------
|
|
|
|
**New in Django development version**
|
|
|
|
If your view makes use of the `Django e-mail services`_, you don't really
|
|
want e-mail to be sent every time you run a test using that view.
|
|
|
|
When the Django test framework is initialized, it transparently replaces the
|
|
normal `SMTPConnection`_ class with a dummy implementation that redirects all
|
|
e-mail to a dummy outbox. This outbox, stored as ``django.core.mail.outbox``,
|
|
is a simple list of all `EmailMessage`_ instances that have been sent.
|
|
For example, during test conditions, it would be possible to run the following
|
|
code::
|
|
|
|
from django.core import mail
|
|
|
|
# Send message
|
|
mail.send_mail('Subject here', 'Here is the message.', 'from@example.com',
|
|
['to@example.com'], fail_silently=False)
|
|
|
|
# One message has been sent
|
|
self.assertEqual(len(mail.outbox), 1)
|
|
# Subject of first message is correct
|
|
self.assertEqual(mail.outbox[0].subject, 'Subject here')
|
|
|
|
The ``mail.outbox`` object does not exist under normal execution conditions.
|
|
The outbox is created during test setup, along with the dummy `SMTPConnection`_.
|
|
When the test framework is torn down, the standard `SMTPConnection`_ class
|
|
is restored, and the test outbox is destroyed.
|
|
|
|
As noted `previously`_, the test outbox is emptied at the start of every
|
|
test in a Django TestCase. To empty the outbox manually, assign the empty list
|
|
to mail.outbox::
|
|
|
|
from django.core import mail
|
|
|
|
# Empty the test outbox
|
|
mail.outbox = []
|
|
|
|
.. _`Django e-mail services`: ../email/
|
|
.. _`SMTPConnection`: ../email/#the-emailmessage-and-smtpconnection-classes
|
|
.. _`EmailMessage`: ../email/#the-emailmessage-and-smtpconnection-classes
|
|
.. _`previously`: #emptying-the-test-outbox
|
|
|
|
Running tests
|
|
=============
|
|
|
|
Run your tests using your project's ``manage.py`` utility::
|
|
|
|
$ ./manage.py test
|
|
|
|
If you only want to run tests for a particular application, add the
|
|
application name to the command line. For example, if your
|
|
``INSTALLED_APPS`` contains ``myproject.polls`` and ``myproject.animals``,
|
|
but you only want to run the animals unit tests, run::
|
|
|
|
$ ./manage.py test animals
|
|
|
|
**New in Django development version:** If you use unit tests, you can be more
|
|
specific in the tests that are executed. To run a single test case in an
|
|
application (for example, the AnimalTestCase described previously), add the
|
|
name of the test case to the label on the command line::
|
|
|
|
$ ./manage.py test animals.AnimalTestCase
|
|
|
|
**New in Django development version:** To run a single test method inside a
|
|
test case, add the name of the test method to the label::
|
|
|
|
$ ./manage.py test animals.AnimalTestCase.testFluffyAnimals
|
|
|
|
When you run your tests, you'll see a bunch of text flow by as the test
|
|
database is created and models are initialized. This test database is
|
|
created from scratch every time you run your tests.
|
|
|
|
By default, the test database gets its name by prepending ``test_`` to
|
|
the database name specified by the ``DATABASE_NAME`` setting; all other
|
|
database settings will the same as they would be for the project normally.
|
|
If you wish to use a name other than the default for the test database,
|
|
you can use the ``TEST_DATABASE_NAME`` setting to provide a name.
|
|
|
|
**New in Django development version:** For fine-grained control over the
|
|
character encoding of your database, use the ``TEST_DATABASE_CHARSET`` setting.
|
|
If you're using MySQL, you can also use the ``TEST_DATABASE_COLLATION`` setting
|
|
to control the particular collation used by the test database. See the
|
|
settings_ documentation for details of these advanced settings.
|
|
|
|
.. _settings: ../settings/
|
|
|
|
The test database is created by the user in the ``DATABASE_USER`` setting.
|
|
This user needs to have sufficient privileges to create a new database on the
|
|
system.
|
|
|
|
Once the test database has been established, Django will run your tests.
|
|
If everything goes well, at the end you'll see::
|
|
|
|
----------------------------------------------------------------------
|
|
Ran 22 tests in 0.221s
|
|
|
|
OK
|
|
|
|
If there are test failures, however, you'll see full details about what tests
|
|
failed::
|
|
|
|
======================================================================
|
|
FAIL: Doctest: ellington.core.throttle.models
|
|
----------------------------------------------------------------------
|
|
Traceback (most recent call last):
|
|
File "/dev/django/test/doctest.py", line 2153, in runTest
|
|
raise self.failureException(self.format_failure(new.getvalue()))
|
|
AssertionError: Failed doctest test for myapp.models
|
|
File "/dev/myapp/models.py", line 0, in models
|
|
|
|
----------------------------------------------------------------------
|
|
File "/dev/myapp/models.py", line 14, in myapp.models
|
|
Failed example:
|
|
throttle.check("actor A", "action one", limit=2, hours=1)
|
|
Expected:
|
|
True
|
|
Got:
|
|
False
|
|
|
|
----------------------------------------------------------------------
|
|
Ran 2 tests in 0.048s
|
|
|
|
FAILED (failures=1)
|
|
|
|
The return code for the script is the total number of failed and erroneous
|
|
tests. If all the tests pass, the return code is 0.
|
|
|
|
Regardless of whether the tests pass or fail, the test database is destroyed when
|
|
all the tests have been executed.
|
|
|
|
Using a different testing framework
|
|
===================================
|
|
|
|
Doctest and Unittest are not the only Python testing frameworks. While
|
|
Django doesn't provide explicit support these alternative frameworks,
|
|
it does provide a mechanism to allow you to invoke tests constructed for
|
|
an alternative framework as if they were normal Django tests.
|
|
|
|
When you run ``./manage.py test``, Django looks at the ``TEST_RUNNER``
|
|
setting to determine what to do. By default, ``TEST_RUNNER`` points to
|
|
``django.test.simple.run_tests``. This method defines the default Django
|
|
testing behavior. This behavior involves:
|
|
|
|
#. Performing global pre-test setup
|
|
#. Creating the test database
|
|
#. Running ``syncdb`` to install models and initial data into the test database
|
|
#. Looking for Unit Tests and Doctests in ``models.py`` and ``tests.py`` file for each installed application
|
|
#. Running the Unit Tests and Doctests that are found
|
|
#. Destroying the test database
|
|
#. Performing global post-test teardown
|
|
|
|
If you define your own test runner method and point ``TEST_RUNNER``
|
|
at that method, Django will execute your test runner whenever you run
|
|
``./manage.py test``. In this way, it is possible to use any test
|
|
framework that can be executed from Python code.
|
|
|
|
Defining a test runner
|
|
----------------------
|
|
By convention, a test runner should be called ``run_tests``; however, you
|
|
can call it anything you want. The only requirement is that it has the
|
|
same arguments as the Django test runner:
|
|
|
|
``run_tests(test_labels, verbosity=1, interactive=True, extra_tests=[])``
|
|
|
|
**New in Django development version:** ``test_labels`` is a list of
|
|
strings describing the tests to be run. A test label can take one of
|
|
three forms:
|
|
|
|
* ``app.TestCase.test_method`` - Run a single test method in a test case
|
|
* ``app.TestCase`` - Run all the test methods in a test case
|
|
* ``app`` - Search for and run all tests in the named application.
|
|
|
|
If ``test_labels`` has a value of ``None``, the test runner should run
|
|
search for tests in all the applications in ``INSTALLED_APPS``.
|
|
|
|
Verbosity determines the amount of notification and debug information that
|
|
will be printed to the console; ``0`` is no output, ``1`` is normal output,
|
|
and ``2`` is verbose output.
|
|
|
|
**New in Django development version:** If ``interactive`` is ``True``, the
|
|
test suite may ask the user for instructions when the test suite is
|
|
executed. An example of this behavior would be asking for permission to
|
|
delete an existing test database. If ``interactive`` is ``False``, the
|
|
test suite must be able to run without any manual intervention.
|
|
|
|
``extra_tests`` is a list of extra ``TestCase`` instances to add to the
|
|
suite that is executed by the test runner. These extra tests are run
|
|
in addition to those discovered in the modules listed in ``module_list``.
|
|
|
|
This method should return the number of tests that failed.
|
|
|
|
Testing utilities
|
|
-----------------
|
|
|
|
To assist in the creation of your own test runner, Django provides
|
|
a number of utility methods in the ``django.test.utils`` module.
|
|
|
|
``setup_test_environment()``
|
|
Performs any global pre-test setup, such as the installing the
|
|
instrumentation of the template rendering system and setting up
|
|
the dummy SMTPConnection.
|
|
|
|
``teardown_test_environment()``
|
|
Performs any global post-test teardown, such as removing the instrumentation
|
|
of the template rendering system and restoring normal e-mail services.
|
|
|
|
``create_test_db(verbosity=1, autoclobber=False)``
|
|
Creates a new test database, and run ``syncdb`` against it.
|
|
|
|
``verbosity`` has the same behavior as in the test runner.
|
|
|
|
``Autoclobber`` describes the behavior that will occur if a database with
|
|
the same name as the test database is discovered. If ``autoclobber`` is False,
|
|
the user will be asked to approve destroying the existing database. ``sys.exit``
|
|
is called if the user does not approve. If autoclobber is ``True``, the database
|
|
will be destroyed without consulting the user.
|
|
|
|
``create_test_db()`` has the side effect of modifying
|
|
``settings.DATABASE_NAME`` to match the name of the test database.
|
|
|
|
``destroy_test_db(old_database_name, verbosity=1)``
|
|
Destroys the database with the name ``settings.DATABASE_NAME`` matching,
|
|
and restores the value of ``settings.DATABASE_NAME`` to the provided name.
|
|
|
|
``verbosity`` has the same behavior as in the test runner.
|