mirror of
				https://github.com/django/django.git
				synced 2025-10-31 09:41:08 +00:00 
			
		
		
		
	[1.6.x] Fixed #21701 -- Improved testing doc titles and added testing/tools.txt.
Thanks cjerdonek for the suggestion.
Backport of 9953e98e6a from master
			
			
This commit is contained in:
		| @@ -13,8 +13,8 @@ The tests cover: | ||||
| We appreciate any and all contributions to the test suite! | ||||
|  | ||||
| The Django tests all use the testing infrastructure that ships with Django for | ||||
| testing applications. See :doc:`Testing Django applications | ||||
| </topics/testing/overview>` for an explanation of how to write new tests. | ||||
| testing applications. See :doc:`/topics/testing/overview` for an explanation of | ||||
| how to write new tests. | ||||
|  | ||||
| .. _running-unit-tests: | ||||
|  | ||||
|   | ||||
| @@ -282,7 +282,7 @@ correctly in a couple different situations. | ||||
|     computer programming, so there's lots of information out there: | ||||
|  | ||||
|     * A good first look at writing tests for Django can be found in the | ||||
|       documentation on :doc:`Testing Django applications </topics/testing/overview>`. | ||||
|       documentation on :doc:`/topics/testing/overview`. | ||||
|     * Dive Into Python (a free online book for beginning Python developers) | ||||
|       includes a great `introduction to Unit Testing`__. | ||||
|     * After reading those, if you want something a little meatier to sink | ||||
|   | ||||
| @@ -588,6 +588,5 @@ the email body. You then only need to set the :setting:`EMAIL_HOST` and | ||||
| :setting:`EMAIL_PORT` accordingly. For a more detailed discussion of SMTP | ||||
| server options, see the Python documentation for the :mod:`smtpd` module. | ||||
|  | ||||
| For information about unit-testing the sending of emails in your | ||||
| application, see the :ref:`topics-testing-email` section of :doc:`Testing | ||||
| Django applications </topics/testing/overview>`. | ||||
| For information about unit-testing the sending of emails in your application, | ||||
| see the :ref:`topics-testing-email` section of the testing documentation. | ||||
|   | ||||
| @@ -2,12 +2,6 @@ | ||||
| Testing in Django | ||||
| ================= | ||||
|  | ||||
| .. toctree:: | ||||
|    :hidden: | ||||
|  | ||||
|    overview | ||||
|    advanced | ||||
|  | ||||
| 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: | ||||
| @@ -28,9 +22,6 @@ it should be doing. | ||||
|  | ||||
| The best part is, it's really easy. | ||||
|  | ||||
| Where to go from here | ||||
| ===================== | ||||
|  | ||||
| The preferred way to write tests in Django is using the :mod:`unittest` module | ||||
| built in to the Python standard library. This is covered in detail in the | ||||
| :doc:`overview` document. | ||||
| @@ -38,3 +29,10 @@ built in to the Python standard library. This is covered in detail in the | ||||
| You can also use any *other* Python test framework; Django provides an API and | ||||
| tools for that kind of integration. They are described in the | ||||
| :ref:`other-testing-frameworks` section of :doc:`advanced`. | ||||
|  | ||||
| .. toctree:: | ||||
|    :maxdepth: 1 | ||||
|  | ||||
|    overview | ||||
|    tools | ||||
|    advanced | ||||
|   | ||||
										
											
												File diff suppressed because it is too large
												Load Diff
											
										
									
								
							
							
								
								
									
										1514
									
								
								docs/topics/testing/tools.txt
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										1514
									
								
								docs/topics/testing/tools.txt
									
									
									
									
									
										Normal file
									
								
							
										
											
												File diff suppressed because it is too large
												Load Diff
											
										
									
								
							
		Reference in New Issue
	
	Block a user