diff options
Diffstat (limited to 'setuptools/tests/test_packageindex.py')
| -rw-r--r-- | setuptools/tests/test_packageindex.py | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/setuptools/tests/test_packageindex.py b/setuptools/tests/test_packageindex.py index 776382d0..107a57b6 100644 --- a/setuptools/tests/test_packageindex.py +++ b/setuptools/tests/test_packageindex.py @@ -60,6 +60,9 @@ class TestPackageIndex(unittest.TestCase): urllib2.urlopen = old_urlopen def test_bad_url_double_scheme(self): + """ + A bad URL with a double scheme should raise a DistutilsError. + """ index = setuptools.package_index.PackageIndex( hosts=('www.example.com',) ) @@ -69,13 +72,9 @@ class TestPackageIndex(unittest.TestCase): try: index.open_url(url) except distutils.errors.DistutilsError, error: - # Python 2.7.3 - self.assertTrue('getaddrinfo failed' in str(error), "error was " + - str(error)) - except httplib.InvalidURL, error: - # Python 2.7.2 and earlier - self.assertTrue('nonnumeric port' in str(error), "error was " + - str(error)) + msg = unicode(error) + assert 'nonnumeric port' in msg or 'getaddrinfo failed' in msg + raise RuntimeError("Did not raise") def test_bad_url_screwy_href(self): index = setuptools.package_index.PackageIndex( |