Skip to content

P
python-poetry
Commit 668b2b18 by Sébastien Eustace
Options

Fix tests for Python 2.7

parent 2fe2bad7
Showing with 61 additions and 32 deletions
tests/console/commands/env/test_remove.py
...@@ -18,8 +18,8 @@ def test_remove_by_python_version(app, tmp_dir, config, mocker): ...@@ -18,8 +18,8 @@ def test_remove_by_python_version(app, tmp_dir, config, mocker):
(Path(tmp_dir) / "{}-py3.7".format(venv_name)).mkdir() (Path(tmp_dir) / "{}-py3.7".format(venv_name)).mkdir()
(Path(tmp_dir) / "{}-py3.6".format(venv_name)).mkdir() (Path(tmp_dir) / "{}-py3.6".format(venv_name)).mkdir()
mocker.patch( check_output = mocker.patch(
"subprocess.check_output", "poetry.utils._compat.subprocess.check_output",
side_effect=check_output_wrapper(Version.parse("3.6.6")), side_effect=check_output_wrapper(Version.parse("3.6.6")),
) )
...@@ -27,6 +27,7 @@ def test_remove_by_python_version(app, tmp_dir, config, mocker): ...@@ -27,6 +27,7 @@ def test_remove_by_python_version(app, tmp_dir, config, mocker):
tester = CommandTester(command) tester = CommandTester(command)
tester.execute("3.6") tester.execute("3.6")
assert check_output.called
assert not (Path(tmp_dir) / "{}-py3.6".format(venv_name)).exists() assert not (Path(tmp_dir) / "{}-py3.6".format(venv_name)).exists()
expected = "Deleted virtualenv: {}\n".format( expected = "Deleted virtualenv: {}\n".format(
...@@ -47,11 +48,6 @@ def test_remove_by_name(app, tmp_dir, config, mocker): ...@@ -47,11 +48,6 @@ def test_remove_by_name(app, tmp_dir, config, mocker):
(Path(tmp_dir) / "{}-py3.7".format(venv_name)).mkdir() (Path(tmp_dir) / "{}-py3.7".format(venv_name)).mkdir()
(Path(tmp_dir) / "{}-py3.6".format(venv_name)).mkdir() (Path(tmp_dir) / "{}-py3.6".format(venv_name)).mkdir()
mocker.patch(
"subprocess.check_output",
side_effect=check_output_wrapper(Version.parse("3.6.6")),
)
command = app.find("env remove") command = app.find("env remove")
tester = CommandTester(command) tester = CommandTester(command)
tester.execute("{}-py3.6".format(venv_name)) tester.execute("{}-py3.6".format(venv_name))
......
tests/console/commands/env/test_use.py
...@@ -46,9 +46,12 @@ def test_activate_activates_non_existing_virtualenv_no_envs_file( ...@@ -46,9 +46,12 @@ def test_activate_activates_non_existing_virtualenv_no_envs_file(
config.add_property("settings.virtualenvs.path", str(tmp_dir)) config.add_property("settings.virtualenvs.path", str(tmp_dir))
mocker.patch("subprocess.check_output", side_effect=check_output_wrapper())
mocker.patch( mocker.patch(
"subprocess.Popen.communicate", "poetry.utils._compat.subprocess.check_output",
side_effect=check_output_wrapper(),
)
mocker.patch(
"poetry.utils._compat.subprocess.Popen.communicate",
side_effect=[("/prefix", None), ("/prefix", None)], side_effect=[("/prefix", None), ("/prefix", None)],
) )
m = mocker.patch("poetry.utils.env.EnvManager.build_venv", side_effect=build_venv) m = mocker.patch("poetry.utils.env.EnvManager.build_venv", side_effect=build_venv)
...@@ -106,11 +109,11 @@ def test_get_prefers_explicitly_activated_virtualenvs_over_env_var( ...@@ -106,11 +109,11 @@ def test_get_prefers_explicitly_activated_virtualenvs_over_env_var(
envs_file.write(doc) envs_file.write(doc)
mocker.patch( mocker.patch(
"subprocess.check_output", "poetry.utils._compat.subprocess.check_output",
side_effect=check_output_wrapper(Version(*current_python)), side_effect=check_output_wrapper(Version(*current_python)),
) )
mocker.patch( mocker.patch(
"subprocess.Popen.communicate", "poetry.utils._compat.subprocess.Popen.communicate",
side_effect=[("/prefix", None), ("/prefix", None), ("/prefix", None)], side_effect=[("/prefix", None), ("/prefix", None), ("/prefix", None)],
) )
...@@ -154,11 +157,11 @@ def test_get_prefers_explicitly_activated_non_existing_virtualenvs_over_env_var( ...@@ -154,11 +157,11 @@ def test_get_prefers_explicitly_activated_non_existing_virtualenvs_over_env_var(
) )
mocker.patch( mocker.patch(
"subprocess.check_output", "poetry.utils._compat.subprocess.check_output",
side_effect=check_output_wrapper(Version(*current_python)), side_effect=check_output_wrapper(Version(*current_python)),
) )
mocker.patch( mocker.patch(
"subprocess.Popen.communicate", "poetry.utils._compat.subprocess.Popen.communicate",
side_effect=[("/prefix", None), ("/prefix", None), ("/prefix", None)], side_effect=[("/prefix", None), ("/prefix", None), ("/prefix", None)],
) )
mocker.patch("poetry.utils.env.EnvManager.build_venv", side_effect=build_venv) mocker.patch("poetry.utils.env.EnvManager.build_venv", side_effect=build_venv)
......
tests/utils/test_env.py
...@@ -79,9 +79,12 @@ def test_activate_activates_non_existing_virtualenv_no_envs_file( ...@@ -79,9 +79,12 @@ def test_activate_activates_non_existing_virtualenv_no_envs_file(
config.add_property("settings.virtualenvs.path", str(tmp_dir)) config.add_property("settings.virtualenvs.path", str(tmp_dir))
mocker.patch("subprocess.check_output", side_effect=check_output_wrapper())
mocker.patch( mocker.patch(
"subprocess.Popen.communicate", "poetry.utils._compat.subprocess.check_output",
side_effect=check_output_wrapper(),
)
mocker.patch(
"poetry.utils._compat.subprocess.Popen.communicate",
side_effect=[("/prefix", None), ("/prefix", None)], side_effect=[("/prefix", None), ("/prefix", None)],
) )
m = mocker.patch("poetry.utils.env.EnvManager.build_venv", side_effect=build_venv) m = mocker.patch("poetry.utils.env.EnvManager.build_venv", side_effect=build_venv)
...@@ -113,8 +116,14 @@ def test_activate_activates_existing_virtualenv_no_envs_file(tmp_dir, config, mo ...@@ -113,8 +116,14 @@ def test_activate_activates_existing_virtualenv_no_envs_file(tmp_dir, config, mo
config.add_property("settings.virtualenvs.path", str(tmp_dir)) config.add_property("settings.virtualenvs.path", str(tmp_dir))
mocker.patch("subprocess.check_output", side_effect=check_output_wrapper()) mocker.patch(
mocker.patch("subprocess.Popen.communicate", side_effect=[("/prefix", None)]) "poetry.utils._compat.subprocess.check_output",
side_effect=check_output_wrapper(),
)
mocker.patch(
"poetry.utils._compat.subprocess.Popen.communicate",
side_effect=[("/prefix", None)],
)
m = mocker.patch("poetry.utils.env.EnvManager.build_venv", side_effect=build_venv) m = mocker.patch("poetry.utils.env.EnvManager.build_venv", side_effect=build_venv)
env = EnvManager(config).activate("python3.7", CWD, NullIO()) env = EnvManager(config).activate("python3.7", CWD, NullIO())
...@@ -146,8 +155,14 @@ def test_activate_activates_same_virtualenv_with_envs_file(tmp_dir, config, mock ...@@ -146,8 +155,14 @@ def test_activate_activates_same_virtualenv_with_envs_file(tmp_dir, config, mock
config.add_property("settings.virtualenvs.path", str(tmp_dir)) config.add_property("settings.virtualenvs.path", str(tmp_dir))
mocker.patch("subprocess.check_output", side_effect=check_output_wrapper()) mocker.patch(
mocker.patch("subprocess.Popen.communicate", side_effect=[("/prefix", None)]) "poetry.utils._compat.subprocess.check_output",
side_effect=check_output_wrapper(),
)
mocker.patch(
"poetry.utils._compat.subprocess.Popen.communicate",
side_effect=[("/prefix", None)],
)
m = mocker.patch("poetry.utils.env.EnvManager.create_venv") m = mocker.patch("poetry.utils.env.EnvManager.create_venv")
env = EnvManager(config).activate("python3.7", CWD, NullIO()) env = EnvManager(config).activate("python3.7", CWD, NullIO())
...@@ -180,11 +195,11 @@ def test_activate_activates_different_virtualenv_with_envs_file( ...@@ -180,11 +195,11 @@ def test_activate_activates_different_virtualenv_with_envs_file(
config.add_property("settings.virtualenvs.path", str(tmp_dir)) config.add_property("settings.virtualenvs.path", str(tmp_dir))
mocker.patch( mocker.patch(
"subprocess.check_output", "poetry.utils._compat.subprocess.check_output",
side_effect=check_output_wrapper(Version.parse("3.6.6")), side_effect=check_output_wrapper(Version.parse("3.6.6")),
) )
mocker.patch( mocker.patch(
"subprocess.Popen.communicate", "poetry.utils._compat.subprocess.Popen.communicate",
side_effect=[("/prefix", None), ("/prefix", None), ("/prefix", None)], side_effect=[("/prefix", None), ("/prefix", None), ("/prefix", None)],
) )
m = mocker.patch("poetry.utils.env.EnvManager.build_venv", side_effect=build_venv) m = mocker.patch("poetry.utils.env.EnvManager.build_venv", side_effect=build_venv)
...@@ -218,9 +233,12 @@ def test_activate_activates_recreates_for_different_patch(tmp_dir, config, mocke ...@@ -218,9 +233,12 @@ def test_activate_activates_recreates_for_different_patch(tmp_dir, config, mocke
config.add_property("settings.virtualenvs.path", str(tmp_dir)) config.add_property("settings.virtualenvs.path", str(tmp_dir))
mocker.patch("subprocess.check_output", side_effect=check_output_wrapper())
mocker.patch( mocker.patch(
"subprocess.Popen.communicate", "poetry.utils._compat.subprocess.check_output",
side_effect=check_output_wrapper(),
)
mocker.patch(
"poetry.utils._compat.subprocess.Popen.communicate",
side_effect=[ side_effect=[
("/prefix", None), ("/prefix", None),
('{"version_info": [3, 7, 0]}', None), ('{"version_info": [3, 7, 0]}', None),
...@@ -271,11 +289,11 @@ def test_activate_does_not_recreate_when_switching_minor(tmp_dir, config, mocker ...@@ -271,11 +289,11 @@ def test_activate_does_not_recreate_when_switching_minor(tmp_dir, config, mocker
config.add_property("settings.virtualenvs.path", str(tmp_dir)) config.add_property("settings.virtualenvs.path", str(tmp_dir))
mocker.patch( mocker.patch(
"subprocess.check_output", "poetry.utils._compat.subprocess.check_output",
side_effect=check_output_wrapper(Version.parse("3.6.6")), side_effect=check_output_wrapper(Version.parse("3.6.6")),
) )
mocker.patch( mocker.patch(
"subprocess.Popen.communicate", "poetry.utils._compat.subprocess.Popen.communicate",
side_effect=[("/prefix", None), ("/prefix", None), ("/prefix", None)], side_effect=[("/prefix", None), ("/prefix", None), ("/prefix", None)],
) )
build_venv_m = mocker.patch( build_venv_m = mocker.patch(
...@@ -313,7 +331,10 @@ def test_deactivate_non_activated_but_existing(tmp_dir, config, mocker): ...@@ -313,7 +331,10 @@ def test_deactivate_non_activated_but_existing(tmp_dir, config, mocker):
config.add_property("settings.virtualenvs.path", str(tmp_dir)) config.add_property("settings.virtualenvs.path", str(tmp_dir))
mocker.patch("subprocess.check_output", side_effect=check_output_wrapper()) mocker.patch(
"poetry.utils._compat.subprocess.check_output",
side_effect=check_output_wrapper(),
)
EnvManager(config).deactivate(CWD, NullIO()) EnvManager(config).deactivate(CWD, NullIO())
env = EnvManager(config).get(CWD) env = EnvManager(config).get(CWD)
...@@ -349,7 +370,10 @@ def test_deactivate_activated(tmp_dir, config, mocker): ...@@ -349,7 +370,10 @@ def test_deactivate_activated(tmp_dir, config, mocker):
config.add_property("settings.virtualenvs.path", str(tmp_dir)) config.add_property("settings.virtualenvs.path", str(tmp_dir))
mocker.patch("subprocess.check_output", side_effect=check_output_wrapper()) mocker.patch(
"poetry.utils._compat.subprocess.check_output",
side_effect=check_output_wrapper(),
)
EnvManager(config).deactivate(CWD, NullIO()) EnvManager(config).deactivate(CWD, NullIO())
env = EnvManager(config).get(CWD) env = EnvManager(config).get(CWD)
...@@ -378,8 +402,14 @@ def test_get_prefers_explicitly_activated_virtualenvs_over_env_var( ...@@ -378,8 +402,14 @@ def test_get_prefers_explicitly_activated_virtualenvs_over_env_var(
doc[venv_name] = {"minor": "3.7", "patch": "3.7.0"} doc[venv_name] = {"minor": "3.7", "patch": "3.7.0"}
envs_file.write(doc) envs_file.write(doc)
mocker.patch("subprocess.check_output", side_effect=check_output_wrapper()) mocker.patch(
mocker.patch("subprocess.Popen.communicate", side_effect=[("/prefix", None)]) "poetry.utils._compat.subprocess.check_output",
side_effect=check_output_wrapper(),
)
mocker.patch(
"poetry.utils._compat.subprocess.Popen.communicate",
side_effect=[("/prefix", None)],
)
env = EnvManager(config).get(CWD) env = EnvManager(config).get(CWD)
...@@ -409,7 +439,7 @@ def test_remove_by_python_version(tmp_dir, config, mocker): ...@@ -409,7 +439,7 @@ def test_remove_by_python_version(tmp_dir, config, mocker):
(Path(tmp_dir) / "{}-py3.6".format(venv_name)).mkdir() (Path(tmp_dir) / "{}-py3.6".format(venv_name)).mkdir()
mocker.patch( mocker.patch(
"subprocess.check_output", "poetry.utils._compat.subprocess.check_output",
side_effect=check_output_wrapper(Version.parse("3.6.6")), side_effect=check_output_wrapper(Version.parse("3.6.6")),
) )
...@@ -429,7 +459,7 @@ def test_remove_by_name(tmp_dir, config, mocker): ...@@ -429,7 +459,7 @@ def test_remove_by_name(tmp_dir, config, mocker):
(Path(tmp_dir) / "{}-py3.6".format(venv_name)).mkdir() (Path(tmp_dir) / "{}-py3.6".format(venv_name)).mkdir()
mocker.patch( mocker.patch(
"subprocess.check_output", "poetry.utils._compat.subprocess.check_output",
side_effect=check_output_wrapper(Version.parse("3.6.6")), side_effect=check_output_wrapper(Version.parse("3.6.6")),
) )
...@@ -449,7 +479,7 @@ def test_remove_also_deactivates(tmp_dir, config, mocker): ...@@ -449,7 +479,7 @@ def test_remove_also_deactivates(tmp_dir, config, mocker):
(Path(tmp_dir) / "{}-py3.6".format(venv_name)).mkdir() (Path(tmp_dir) / "{}-py3.6".format(venv_name)).mkdir()
mocker.patch( mocker.patch(
"subprocess.check_output", "poetry.utils._compat.subprocess.check_output",
side_effect=check_output_wrapper(Version.parse("3.6.6")), side_effect=check_output_wrapper(Version.parse("3.6.6")),
) )
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment