diff options
| author | Jason R. Coombs <jaraco@jaraco.com> | 2013-06-18 08:44:39 -0500 |
|---|---|---|
| committer | Jason R. Coombs <jaraco@jaraco.com> | 2013-06-18 08:44:39 -0500 |
| commit | fb8c7cf0abc9ce58b8a6f0621c0a9909fb9b8eff (patch) | |
| tree | 95cae06260f49e011fc045000fc1531dbc0e0cf5 /tests/test_distribute_setup.py | |
| parent | 32ba6930fa97bbeac9392cac3ed49aac87fd1018 (diff) | |
| parent | db678072da41b75408680dab3e23c1b76573bf1d (diff) | |
| download | external_python_setuptools-fb8c7cf0abc9ce58b8a6f0621c0a9909fb9b8eff.tar.gz external_python_setuptools-fb8c7cf0abc9ce58b8a6f0621c0a9909fb9b8eff.tar.bz2 external_python_setuptools-fb8c7cf0abc9ce58b8a6f0621c0a9909fb9b8eff.zip | |
Merge with upstream
--HG--
branch : distribute
Diffstat (limited to 'tests/test_distribute_setup.py')
| -rw-r--r-- | tests/test_distribute_setup.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/test_distribute_setup.py b/tests/test_distribute_setup.py index 37c6cf82..4f86c335 100644 --- a/tests/test_distribute_setup.py +++ b/tests/test_distribute_setup.py @@ -43,13 +43,13 @@ class TestSetup(unittest.TestCase): # now trying to import it sys.path[0] = egg import setuptools - self.assert_(setuptools.__file__.startswith(egg)) + self.assertTrue(setuptools.__file__.startswith(egg)) def test_do_download(self): tmpdir = tempfile.mkdtemp() _do_download(DEFAULT_VERSION, DEFAULT_URL, tmpdir, 1) import setuptools - self.assert_(setuptools.bootstrap_install_from.startswith(tmpdir)) + self.assertTrue(setuptools.bootstrap_install_from.startswith(tmpdir)) def test_install(self): def _faked(*args): @@ -58,7 +58,7 @@ class TestSetup(unittest.TestCase): _install(self.tarball) def test_use_setuptools(self): - self.assertEquals(use_setuptools(), None) + self.assertEqual(use_setuptools(), None) # make sure fake_setuptools is not called by default import pkg_resources |