aboutsummaryrefslogtreecommitdiffstats
path: root/tests/test_distribute_setup.py
diff options
context:
space:
mode:
authorLennart Regebro <regebro@gmail.com>2012-08-22 16:41:06 +0200
committerLennart Regebro <regebro@gmail.com>2012-08-22 16:41:06 +0200
commite743dabde0d60aaeca5c9e4dc5c29ac3ac625646 (patch)
tree762c1a2b019343b1ff29be16441ae3560d9eba50 /tests/test_distribute_setup.py
parentec0ed85656b96812402439fa23c877fd27b99de5 (diff)
downloadexternal_python_setuptools-e743dabde0d60aaeca5c9e4dc5c29ac3ac625646.tar.gz
external_python_setuptools-e743dabde0d60aaeca5c9e4dc5c29ac3ac625646.tar.bz2
external_python_setuptools-e743dabde0d60aaeca5c9e4dc5c29ac3ac625646.zip
Got rid of deprecated assert_ and assertEquals.
--HG-- branch : distribute extra : rebase_source : 9d7032bac7db98e445ab6a46b2610c278c691c2d
Diffstat (limited to 'tests/test_distribute_setup.py')
-rw-r--r--tests/test_distribute_setup.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/test_distribute_setup.py b/tests/test_distribute_setup.py
index 4151587f..1f3da058 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