Environments are now installed to version-specific locations. Resolves #229

This commit is contained in:
Anthony Sottile 2015-05-16 19:16:23 -04:00
parent 154d918ff1
commit 45d4a195ef
9 changed files with 71 additions and 44 deletions

View file

@ -10,9 +10,9 @@ from testing.util import xfailif_windows_no_ruby
def test_install_rbenv(cmd_runner):
_install_rbenv(cmd_runner)
# Should have created rbenv directory
assert os.path.exists(cmd_runner.path('rbenv'))
assert os.path.exists(cmd_runner.path('rbenv-default'))
# We should have created our `activate` script
activate_path = cmd_runner.path('rbenv', 'bin', 'activate')
activate_path = cmd_runner.path('rbenv-default', 'bin', 'activate')
assert os.path.exists(activate_path)
# Should be able to activate using our script and access rbenv
@ -20,7 +20,7 @@ def test_install_rbenv(cmd_runner):
[
'bash',
'-c',
". '{prefix}rbenv/bin/activate' && rbenv --help",
". '{prefix}rbenv-default/bin/activate' && rbenv --help",
],
)
@ -34,6 +34,6 @@ def test_install_rbenv_with_version(cmd_runner):
[
'bash',
'-c',
". '{prefix}rbenv/bin/activate' && rbenv install --help",
". '{prefix}rbenv-1.9.3p547/bin/activate' && rbenv install --help",
],
)

View file

@ -338,7 +338,7 @@ def test_control_c_control_c_on_install(tmpdir_factory, store):
repo.run_hook(hook, [])
# Should have made an environment, however this environment is broken!
assert os.path.exists(repo.cmd_runner.path('py_env'))
assert os.path.exists(repo.cmd_runner.path('py_env-default'))
# However, it should be perfectly runnable (reinstall after botched
# install)