Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Edited testing.txt changes from [17289]

git-svn-id: http://code.djangoproject.com/svn/django/trunk@17307 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit ffb0519d44dbf6254f0c0600397d901d207be839 1 parent 32ee74f
Adrian Holovaty authored December 30, 2011

Showing 1 changed file with 6 additions and 7 deletions. Show diff stats Hide diff stats

  1. 13  docs/topics/testing.txt
13  docs/topics/testing.txt
@@ -1781,8 +1781,7 @@ via the :djadminopt:`--liveserver` option, for example:
1781 1781
 
1782 1782
 Another way of changing the default server address is by setting the
1783 1783
 `DJANGO_LIVE_TEST_SERVER_ADDRESS` environment variable somewhere in your
1784  
-code (for example in a :ref:`custom test runner<topics-testing-test_runner>`
1785  
-if you're using one):
  1784
+code (for example, in a :ref:`custom test runner<topics-testing-test_runner>`):
1786 1785
 
1787 1786
 .. code-block:: python
1788 1787
 
@@ -1790,18 +1789,18 @@ if you're using one):
1790 1789
     os.environ['DJANGO_LIVE_TEST_SERVER_ADDRESS'] = 'localhost:8082'
1791 1790
 
1792 1791
 In the case where the tests are run by multiple processes in parallel (for
1793  
-example in the context of several simultaneous `continuous integration`_
1794  
-builds), the processes will compete for the same address and therefore your
  1792
+example, in the context of several simultaneous `continuous integration`_
  1793
+builds), the processes will compete for the same address, and therefore your
1795 1794
 tests might randomly fail with an "Address already in use" error. To avoid this
1796 1795
 problem, you can pass a comma-separated list of ports or ranges of ports (at
1797  
-least as many as the number of potential parallel processes), for example:
  1796
+least as many as the number of potential parallel processes). For example:
1798 1797
 
1799 1798
 .. code-block:: bash
1800 1799
 
1801 1800
     ./manage.py test --liveserver=localhost:8082,8090-8100,9000-9200,7041
1802 1801
 
1803  
-Then, during the execution of the tests, each new live test server will try
1804  
-every specified port until it finds one that is free and takes it.
  1802
+Then, during test execution, each new live test server will try every specified
  1803
+port until it finds one that is free and takes it.
1805 1804
 
1806 1805
 .. _continuous integration: http://en.wikipedia.org/wiki/Continuous_integration
1807 1806
 

0 notes on commit ffb0519

Please sign in to comment.
Something went wrong with that request. Please try again.