fix test names, remove old doctest files

Author: Carl Meyer

tests/test_basic.py

@@ -2,19 +2,21 @@
 from os.path import abspath, join, dirname, pardir
 from test_pip import here, reset_env, run_pip, pyversion, lib_py
 
-def test_0():
-    '''
-    Check we are running proper version of pip in run_pip::
-    '''
+def test_correct_pip_version():
+    """
+    Check we are running proper version of pip in run_pip.
+    
+    """
     reset_env()
     base = abspath(join(dirname(__file__), pardir))
     result = run_pip('--version')
     assert base in result.stdout, result.stdout
 
-def test_1():
-    '''
-    First a test of the distutils-configuration-setting command (which is distinct from other commands)::
-    '''
+def test_distutils_configuration_setting():
+    """
+    Test the distutils-configuration-setting command (which is distinct from other commands).
+    
+    """
     #print run_pip('-vv', '--distutils-cfg=easy_install:index_url:http://download.zope.org/ppix/', expect_error=True)
     #Script result: python ../../poacheggs.py -E .../poacheggs-tests/test-scratch -vv --distutils-cfg=easy_install:index_url:http://download.zope.org/ppix/
     #-- stdout: --------------------
@@ -25,29 +27,32 @@ def test_1():
     #-- updated: -------------------
     #  lib/python2.4/distutils/distutils.cfg  (346 bytes)
 
-def test_2():
-    '''
-    Next, a simple test::
-    '''
+def test_install_from_pypi():
+    """
+    Test installing a package from PyPI.
+    
+    """
     reset_env()
     result = run_pip('install', '-vvv', 'INITools==0.2', expect_error=True)
-    assert (lib_py + 'site-packages/INITools-0.2-py%s.egg-info' % pyversion) in result.files_created, str(result) #sorted(result.files_created.keys())
+    assert (lib_py + 'site-packages/INITools-0.2-py%s.egg-info' % pyversion) in result.files_created, str(result)
     assert (lib_py + 'site-packages/initools') in result.files_created, sorted(result.files_created.keys())
 
-def test_3():
-    '''
-    Let's try that again, editable::
-    '''
+def test_editable_install():
+    """
+    Test editable installation.
+    
+    """
     reset_env()
     result = run_pip('install', '-e', 'INITools==0.2', expect_error=True)
     assert "--editable=INITools==0.2 should be formatted with svn+URL" in result.stdout
     assert len(result.files_created) == 1, result.files_created
     assert not result.files_updated, result.files_updated
 
-def test_4():
-    '''
-    Now, checking out from svn::
-    '''
+def test_install_editable_from_svn():
+    """
+    Test checking out from svn.
+    
+    """
     reset_env()
     result = run_pip('install', '-e', 'svn+http://svn.colorstudy.com/INITools/trunk#egg=initools-dev', expect_error=True)
     egg_link = result.files_created[lib_py + 'site-packages/INITools.egg-link']
@@ -58,18 +63,20 @@ def test_4():
     assert 'src/initools/.svn' in result.files_created
 
 
-def test_5():
-    '''
-    Using package==dev::
-    '''
+def test_install_dev_version_from_pypi():
+    """
+    Test using package==dev.
+    
+    """
     reset_env()
     result = run_pip('install', 'INITools==dev', expect_error=True)
     assert (lib_py + 'site-packages/initools') in result.files_created, str(result.stdout)
 
-def test_6():
-    '''
-    Cloning from Git::
-    '''
+def test_install_editable_from_git():
+    """
+    Test cloning from Git.
+    
+    """
     reset_env()
     result = run_pip('install', '-e', 'git://github.com/jezdez/django-feedutil.git#egg=django-feedutil', expect_error=True)
     egg_link = result.files_created[lib_py + 'site-packages/django-feedutil.egg-link']
@@ -79,10 +86,11 @@ def test_6():
     assert 'src/django-feedutil' in result.files_created
     assert 'src/django-feedutil/.git' in result.files_created
 
-def test_7():
-    '''
-    Cloning from Mercurial::
-    '''
+def test_install_editable_from_hg():
+    """
+    Test cloning from Mercurial.
+    
+    """
     reset_env()
     result = run_pip('install', '-e', 'hg+http://bitbucket.org/ubernostrum/django-registration/#egg=django-registration', expect_error=True)
     egg_link = result.files_created[lib_py + 'site-packages/django-registration.egg-link']
@@ -92,18 +100,20 @@ def test_7():
     assert 'src/django-registration' in result.files_created
     assert 'src/django-registration/.hg' in result.files_created
 
-def test_8():
-    '''
-    Presence or absence of final slash is also normalized::
-    '''
+def test_vcs_url_final_slash_normalization():
+    """
+    Test that presence or absence of final slash in VCS URL is normalized.
+    
+    """
     reset_env()
     result = run_pip('install', '-e', 'hg+http://bitbucket.org/ubernostrum/django-registration#egg=django-registration', expect_error=True)
     assert 'pip-log.txt' not in result.files_created, result.files_created['pip-log.txt'].bytes
 
-def test_9():
-    '''
-    Checking out from Bazaar::
-    '''
+def test_install_editable_from_bazaar():
+    """
+    Test checking out from Bazaar.
+    
+    """
     reset_env()
     result = run_pip('install', '-e', 'bzr+http://bazaar.launchpad.net/%7Edjango-wikiapp/django-wikiapp/release-0.1/@174#egg=django-wikiapp', expect_error=True)
     egg_link = result.files_created[lib_py + 'site-packages/django-wikiapp.egg-link']
@@ -113,10 +123,11 @@ def test_9():
     assert 'src/django-wikiapp' in result.files_created
     assert 'src/django-wikiapp/.bzr' in result.files_created
 
-def test_10():
-    '''
-    Urlquoted characters are normalized for repo URL comparison::
-    '''
+def test_vcs_url_urlquote_normalization():
+    """
+    Test that urlquoted characters are normalized for repo URL comparison.
+    
+    """
     reset_env()
     result = run_pip('install', '-e', 'bzr+http://bazaar.launchpad.net/~django-wikiapp/django-wikiapp/release-0.1#egg=django-wikiapp', expect_error=True)
     assert 'pip-log.txt' not in result.files_created, result.files_created['pip-log.txt'].bytes

tests/test_basic.txt

@@ -5,12 +5,13 @@
 from test_pip import here, reset_env, run_pip, pyversion, lib_py
 from test_pip import write_file
 
-def test_1():
-    '''
-    Test making a bundle.  We'll grab one package from the filesystem (the
-    FSPkg dummy package), one from vcs (initools) and one from an index
-    (pip itself)::
-    '''
+def test_create_bundle():
+    """
+    Test making a bundle.  We'll grab one package from the filesystem
+    (the FSPkg dummy package), one from vcs (initools) and one from an
+    index (pip itself).
+
+    """
     reset_env()
     fspkg = 'file://%s/FSPkg' %join(here, 'packages')
     dummy = run_pip('install', '-e', fspkg)
@@ -26,4 +27,3 @@ def test_1():
     assert 'src/FSPkg/' in files
     assert 'src/initools/' in files
     assert 'build/pip/' in files
-