From 35479566e62c4a4eedf9eebc0f30201bad9df2c2 Mon Sep 17 00:00:00 2001 From: Carl Meyer Date: Sun, 11 Dec 2011 22:44:13 -0700 Subject: [PATCH] Adjust the extras tests to be py3-compatible. --- tests/test_extras.py | 47 +++++++++++--------------------------------- 1 file changed, 12 insertions(+), 35 deletions(-) diff --git a/tests/test_extras.py b/tests/test_extras.py index e50ac0237..ec2fa14ef 100644 --- a/tests/test_extras.py +++ b/tests/test_extras.py @@ -1,49 +1,26 @@ from os.path import join -from tests.test_pip import reset_env, run_pip, pyversion, assert_all_changes +from tests.test_pip import reset_env, run_pip def test_simple_extras_install_from_pypi(): """ - Test installing a package from PyPI using extras dependency Paste[flup]. + Test installing a package from PyPI using extras dependency Paste[openid]. """ e = reset_env() - result = run_pip('install', '-vvv', 'Paste[flup]==1.7.5.1') - egg_info_folder = e.site_packages / 'flup-1.0.3.dev_20110405-py%s.egg-info' % pyversion - initools_folder = e.site_packages / 'flup' - assert egg_info_folder in result.files_created, str(result) - assert initools_folder in result.files_created, str(result) + result = run_pip('install', 'Paste[openid]==1.7.5.1', expect_stderr=True) + initools_folder = e.site_packages / 'openid' + assert initools_folder in result.files_created, result.files_created -def test_multiple_extras_install_from_pypi(): - """ - Test installing a package from PyPI using multiple extras dependency Paste[flup, openid]. - """ - e = reset_env() - result = run_pip('install', '-vvv', 'Paste[flup, openid]==1.7.5.1') - egg_info_folder = e.site_packages / 'flup-1.0.3.dev_20110405-py%s.egg-info' % pyversion - initools_folder = e.site_packages / 'flup' - assert egg_info_folder in result.files_created, str(result) - assert initools_folder in result.files_created, str(result) - # openid too - egg_info_folder = e.site_packages / 'python_openid-2.2.5-py%s.egg-info' % pyversion - initools_folder = e.site_packages / 'openid' - assert egg_info_folder in result.files_created, str(result) - assert initools_folder in result.files_created, str(result) - - def test_no_extras_uninstall(): """ - Check that no extras dependency gets uninstalled when the root package gets uninstalled + No extras dependency gets uninstalled when the root package is uninstalled """ env = reset_env() - result = run_pip('install', '-vvv', 'Paste[flup]==1.7.5.1') + result = run_pip('install', 'Paste[openid]==1.7.5.1', expect_stderr=True) assert join(env.site_packages, 'paste') in result.files_created, sorted(result.files_created.keys()) - assert join(env.site_packages, 'flup') in result.files_created, sorted(result.files_created.keys()) - result2 = run_pip('uninstall', 'Paste', '-y', expect_error=True) - # no references to flup should be detected - egg_info_folder = env.site_packages / 'flup-1.0.3.dev_20110405-py%s.egg-info' % pyversion - initools_folder = env.site_packages / 'flup' - assert not egg_info_folder in result2.files_deleted, str(result) - assert not initools_folder in result2.files_deleted, str(result) - - \ No newline at end of file + assert join(env.site_packages, 'openid') in result.files_created, sorted(result.files_created.keys()) + result2 = run_pip('uninstall', 'Paste', '-y') + # openid should not be uninstalled + initools_folder = env.site_packages / 'openid' + assert not initools_folder in result2.files_deleted, result.files_deleted