summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorJason R. Coombs <jaraco@jaraco.com>2013-03-19 12:06:28 -0700
committerJason R. Coombs <jaraco@jaraco.com>2013-03-19 12:06:28 -0700
commit95c3f1697cc3832e57149f49f564da309ef36968 (patch)
tree29143b715d41c1d9a3167571ae2cc68aa23b910b /tests
parenta912153b27274cd72d9744ff88a5e30825837b71 (diff)
downloadpython-setuptools-bitbucket-95c3f1697cc3832e57149f49f564da309ef36968.tar.gz
Update test_distribute_setup to reference ez_setup.py
Diffstat (limited to 'tests')
-rw-r--r--tests/test_ez_setup.py (renamed from tests/test_distribute_setup.py)18
1 files changed, 4 insertions, 14 deletions
diff --git a/tests/test_distribute_setup.py b/tests/test_ez_setup.py
index 1f3da058..922bd884 100644
--- a/tests/test_distribute_setup.py
+++ b/tests/test_ez_setup.py
@@ -9,10 +9,9 @@ CURDIR = os.path.abspath(os.path.dirname(__file__))
TOPDIR = os.path.split(CURDIR)[0]
sys.path.insert(0, TOPDIR)
-from distribute_setup import (use_setuptools, _build_egg, _python_cmd,
- _do_download, _install, DEFAULT_URL,
- DEFAULT_VERSION)
-import distribute_setup
+from ez_setup import (use_setuptools, _build_egg, _python_cmd, _do_download,
+ _install, DEFAULT_URL, DEFAULT_VERSION)
+import ez_setup
class TestSetup(unittest.TestCase):
@@ -54,20 +53,11 @@ class TestSetup(unittest.TestCase):
def test_install(self):
def _faked(*args):
return True
- distribute_setup.python_cmd = _faked
+ ez_setup.python_cmd = _faked
_install(self.tarball)
def test_use_setuptools(self):
self.assertEqual(use_setuptools(), None)
- # make sure fake_setuptools is not called by default
- import pkg_resources
- del pkg_resources._distribute
- def fake_setuptools(*args):
- raise AssertionError
-
- pkg_resources._fake_setuptools = fake_setuptools
- use_setuptools()
-
if __name__ == '__main__':
unittest.main()