diff options
Diffstat (limited to 'setuptools/tests/test_easy_install.py')
| -rw-r--r-- | setuptools/tests/test_easy_install.py | 36 |
1 files changed, 20 insertions, 16 deletions
diff --git a/setuptools/tests/test_easy_install.py b/setuptools/tests/test_easy_install.py index 692982b3..4791e03c 100644 --- a/setuptools/tests/test_easy_install.py +++ b/setuptools/tests/test_easy_install.py @@ -158,10 +158,13 @@ class TestUserInstallTest(unittest.TestCase): self.old_cwd = os.getcwd() os.chdir(self.dir) if sys.version >= "2.6": + self.old_enable = site.ENABLE_USER_SITE + self.old_file = easy_install_pkg.__file__ self.old_base = site.USER_BASE site.USER_BASE = tempfile.mkdtemp() self.old_site = site.USER_SITE site.USER_SITE = tempfile.mkdtemp() + easy_install_pkg.__file__ = site.USER_SITE def tearDown(self): os.chdir(self.old_cwd) @@ -171,33 +174,34 @@ class TestUserInstallTest(unittest.TestCase): shutil.rmtree(site.USER_SITE) site.USER_BASE = self.old_base site.USER_SITE = self.old_site + site.ENABLE_USER_SITE = self.old_enable + easy_install_pkg.__file__ = self.old_file - def test_install(self): + def test_user_install_implied(self): + site.ENABLE_USER_SITE = True # disabled sometimes #XXX: replace with something meaningfull - return if sys.version < "2.6": - return + return #SKIP dist = Distribution() dist.script_name = 'setup.py' cmd = easy_install(dist) - cmd.user = 1 cmd.args = ['py'] cmd.ensure_finalized() - cmd.user = 1 - old_stdout = sys.stdout - sys.stdout = StringIO() - try: - cmd.run() - finally: - sys.stdout = old_stdout - - # let's see if we got our egg link at the right place - content = os.listdir(site.USER_SITE) - content.sort() - self.assertEquals(content, ['UNKNOWN.egg-link', 'easy-install.pth']) + self.assertTrue(cmd.user, 'user should be implied') def test_multiproc_atexit(self): if not _MULTIPROC: return _LOG.info('this should not break') + def test_user_install_not_implied_without_usersite_enabled(self): + site.ENABLE_USER_SITE = False # disabled sometimes + #XXX: replace with something meaningfull + if sys.version < "2.6": + return #SKIP + dist = Distribution() + dist.script_name = 'setup.py' + cmd = easy_install(dist) + cmd.args = ['py'] + cmd.initialize_options() + self.assertFalse(cmd.user, 'NOT user should be implied') |