Merge pull request #662 from kennethreitz/tests

Tests

.travis.yml

@@ -15,7 +15,7 @@ install:
 
 # command to run the dependencies
 script:
-  - "pipenv run pytest tests"
+  - "pipenv run pytest -n 8 tests"
 
 # command to run tests
 # jobs:

Pipfile

@@ -1,13 +1,14 @@
 [dev-packages]
 
-flake8 = ">=3.3.0,<4"
+"flake8" = ">=3.3.0,<4"
 pytest = "*"
 mock = "*"
 sphinx = "<=1.5.5"
 "-e ." = "*"
 twine = "*"
-sphinx-click = "*"
+"sphinx-click" = "*"
+"pytest-xdist" = {version = "*", os_name = "=='posix'"}
 
 
 [requires]
-python_version = "3.6"
+python_version = "3.6"

appveyor.yml

@@ -52,4 +52,4 @@ install:
   - "pipenv install --system --dev --skip-lock"
 
 test_script:
-  - "pytest test_windows/ tests/test_utils.py tests/test_project.py"
+  - "pytest tests/test_pipenv.py tests/test_project.py tests/test_utils.py"

pipenv/utils.py

@@ -272,7 +272,7 @@ packages = [
 
 def suggest_package(package):
     """Suggests a package name, given a package name."""
-    if ('-' in package) or ('[' in package):
+    if ('-' in package) or ('[' in package) or ('+' in package):
         THRESHOLD = 90
     else:
         THRESHOLD = 86

tests/test_legacy.py

@@ -0,0 +1,412 @@
+import os
+
+from mock import patch, Mock, PropertyMock
+
+import pytest
+from pipenv.vendor import toml
+from pipenv.vendor import delegator
+
+from pipenv.cli import (
+    activate_virtualenv, ensure_proper_casing, pip_install, pip_download
+)
+from pipenv.project import Project
+
+# Tell pipenv to ignore activated virtualenvs.
+os.environ['PIPENV_IGNORE_VIRTUALENVS'] = 'True'
+
+
+class TestPipenv():
+
+    def test_cli_usage(self):
+        delegator.run('mkdir test_project')
+        os.chdir('test_project')
+
+        os.environ['PIPENV_VENV_IN_PROJECT'] = '1'
+
+        assert delegator.run('touch Pipfile').return_code == 0
+
+        assert delegator.run('pipenv --python python').return_code == 0
+        assert delegator.run('pipenv install Werkzeug').return_code == 0
+        assert delegator.run('pipenv install pytest --dev').return_code == 0
+        # assert delegator.run('pipenv install https://pypi.python.org/packages/49/df/50aa1999ab9bde74656c2919d9c0c085fd2b3775fd3eca826012bef76d8c/requests-2.18.4-py2.py3-none-any.whl#md5=eb9be71cc41fd73a51a7c9cd1adde5de').return_code == 0
+
+        # Debug.
+        print(delegator.run('pipenv install regex').err)
+
+        assert delegator.run('pipenv install regex').return_code == 0  # failing before
+        assert delegator.run('pipenv install git+https://github.com/requests/requests.git@v2.18.4#egg=requests').return_code == 0
+        assert delegator.run('pipenv lock').return_code == 0
+        assert delegator.run('pipenv update --dev --dry-run').return_code == 0
+
+        # Test uninstalling a package after locking.
+        assert delegator.run('pipenv uninstall Werkzeug').return_code == 0
+
+        pipfile_output = delegator.run('cat Pipfile').out
+        lockfile_output = delegator.run('cat Pipfile.lock').out
+
+        # Ensure uninstall works.
+        assert 'Werkzeug' not in pipfile_output
+        assert 'werkzeug' not in lockfile_output
+
+        # Ensure dev-packages work.
+        assert 'pytest' in pipfile_output
+        assert 'pytest' in lockfile_output
+
+        # Ensure vcs dependencies work.
+        assert 'requests' in pipfile_output
+        assert '"git": "https://github.com/requests/requests.git"' in lockfile_output
+
+        os.chdir('..')
+        delegator.run('rm -fr test_project')
+
+    def test_requirements_to_pipfile(self):
+        delegator.run('mkdir test_requirements_to_pip')
+        os.chdir('test_requirements_to_pip')
+
+        os.environ['PIPENV_VENV_IN_PROJECT'] = '1'
+        os.environ['PIPENV_MAX_DEPTH'] = '1'
+
+        with open('requirements.txt', 'w') as f:
+            f.write('requests[socks]==2.18.1\n'
+                    'git+https://github.com/kennethreitz/records.git@v0.5.0#egg=records\n'
+                    '-e git+https://github.com/kennethreitz/tablib.git@v0.11.5#egg=tablib\n'
+                    'six==1.10.0\n')
+
+        assert delegator.run('pipenv --python python').return_code == 0
+        print(delegator.run('pipenv lock').err)
+        assert delegator.run('pipenv lock').return_code == 0
+
+        pipfile_output = delegator.run('cat Pipfile').out
+        lockfile_output = delegator.run('cat Pipfile.lock').out
+
+        # Ensure extras work.
+        assert 'socks' in pipfile_output
+        assert 'pysocks' in lockfile_output
+
+        # Ensure vcs dependencies work.
+        assert 'records' in pipfile_output
+        assert '"git": "https://github.com/kennethreitz/records.git"' in lockfile_output
+
+        # Ensure editable packages work.
+        assert 'ref = "v0.11.5"' in pipfile_output
+        assert '"editable": true' in lockfile_output
+
+        # Ensure BAD_PACKAGES aren't copied into Pipfile from requirements.txt.
+        assert 'six = "==1.10.0"' not in pipfile_output
+
+        os.chdir('..')
+        delegator.run('rm -fr test_requirements_to_pip')
+        del os.environ['PIPENV_MAX_DEPTH']
+
+    def test_timeout_long(self):
+        delegator.run('mkdir test_timeout_long')
+        os.chdir('test_timeout_long')
+
+        os.environ['PIPENV_VENV_IN_PROJECT'] = '1'
+        os.environ['PIPENV_TIMEOUT'] = '60'
+
+        assert delegator.run('touch Pipfile').return_code == 0
+
+        assert delegator.run('pipenv --python python').return_code == 0
+
+        os.chdir('..')
+        delegator.run('rm -fr test_timeout_long')
+        del os.environ['PIPENV_TIMEOUT']
+
+    def test_timeout_short(self):
+        delegator.run('mkdir test_timeout_short')
+        os.chdir('test_timeout_short')
+
+        os.environ['PIPENV_VENV_IN_PROJECT'] = '1'
+        os.environ['PIPENV_TIMEOUT'] = '1'
+
+        assert delegator.run('touch Pipfile').return_code == 0
+
+        assert delegator.run('pipenv --python python').return_code == 1
+
+        os.chdir('..')
+        delegator.run('rm -fr test_timeout_short')
+        del os.environ['PIPENV_TIMEOUT']
+
+    def test_pipenv_uninstall(self):
+        delegator.run('mkdir test_pipenv_uninstall')
+        os.chdir('test_pipenv_uninstall')
+
+        # Build the environment.
+        os.environ['PIPENV_VENV_IN_PROJECT'] = '1'
+        assert delegator.run('touch Pipfile').return_code == 0
+        assert delegator.run('pipenv --python python').return_code == 0
+
+        # Add entries to Pipfile.
+        assert delegator.run('pipenv install Werkzeug').return_code == 0
+        assert delegator.run('pipenv install pytest --dev').return_code == 0
+
+        pipfile_output = delegator.run('cat Pipfile').out
+        pipfile_list = pipfile_output.split('\n')
+
+        assert 'werkzeug = "*"' in pipfile_list
+        assert 'pytest = "*"' in pipfile_list
+        assert '[packages]' in pipfile_list
+        assert '[dev-packages]' in pipfile_list
+
+        # Uninstall from dev-packages, removing TOML section.
+        assert delegator.run('pipenv uninstall pytest').return_code == 0
+
+        # Test uninstalling non-existant dependency.
+        c = delegator.run('pipenv uninstall NotAPackage')
+        assert c.return_code == 0
+        assert 'No package NotAPackage to remove from Pipfile.' in c.out
+
+        pipfile_output = delegator.run('cat Pipfile').out
+        pipfile_list = pipfile_output.split('\n')
+
+        assert 'Werkzeug = "*"' in pipfile_list
+        assert 'pytest = "*"' not in pipfile_list
+        assert '[packages]' in pipfile_list
+        # assert '[dev-packages]' not in pipfile_list
+
+        os.chdir('..')
+        delegator.run('rm -fr test_pipenv_uninstall')
+
+    def test_pipenv_uninstall_dev(self):
+        delegator.run('mkdir test_pipenv_uninstall_dev')
+        os.chdir('test_pipenv_uninstall_dev')
+
+        # Build the environment.
+        os.environ['PIPENV_VENV_IN_PROJECT'] = '1'
+        assert delegator.run('touch Pipfile').return_code == 0
+        assert delegator.run('pipenv --python python').return_code == 0
+
+        # Add entries to Pipfile.
+        assert delegator.run('pipenv install pytest --dev').return_code == 0
+
+        pipfile_output = delegator.run('cat Pipfile').out
+        pipfile_list = pipfile_output.split('\n')
+
+        assert '[dev-packages]' in pipfile_list
+        assert 'pytest = "*"' in pipfile_list
+
+        # Uninstall from dev-packages, removing TOML section.
+        assert delegator.run('pipenv uninstall -d pytest').return_code == 0
+
+        pipfile_output = delegator.run('cat Pipfile').out
+        pipfile_list = pipfile_output.split('\n')
+
+        assert 'pytest = "*"' not in pipfile_list
+
+        os.chdir('..')
+        delegator.run('rm -fr test_pipenv_uninstall_dev')
+
+    def test_pipenv_run(self):
+        working_dir = 'test_pipenv_run'
+        delegator.run('mkdir {0}'.format(working_dir))
+        os.chdir(working_dir)
+
+        # Build the environment.
+        os.environ['PIPENV_VENV_IN_PROJECT'] = '1'
+        delegator.run('touch Pipfile')
+
+        # Install packages for test.
+        # print(delegator.run('pipenv install pep8').err)
+        assert delegator.run('pipenv install pep8').return_code == 0
+        assert delegator.run('pipenv install pytest').return_code == 0
+
+        # Run test commands.
+        assert delegator.run('pipenv run python -c \'print("test")\'').return_code == 0
+        assert delegator.run('pipenv run pep8 --version').return_code == 0
+        assert delegator.run('pipenv run pytest --version').return_code == 0
+
+        os.chdir('..')
+        delegator.run('rm -fr {0}'.format(working_dir))
+
+    def test_ensure_proper_casing_names(self):
+        """Ensure proper casing for package names."""
+        pfile_test = ("[packages]\n"
+                      "DjAnGO = \"*\"\n"
+                      "flask = \"==0.11\"\n"
+                      "\n\n"
+                      "[dev-packages]\n"
+                      "PyTEST = \"*\"\n")
+
+        # Load test Pipfile.
+        p = toml.loads(pfile_test)
+
+        assert 'DjAnGO' in p['packages']
+        assert 'PyTEST' in p['dev-packages']
+
+        changed = ensure_proper_casing(p)
+
+        assert 'Django' in p['packages']
+        assert 'DjAnGO' not in p['packages']
+
+        assert 'pytest' in p['dev-packages']
+        assert 'PyTEST' not in p['dev-packages']
+
+        assert changed is True
+
+    def test_ensure_proper_casing_no_change(self):
+        """Ensure changed flag is false with no changes."""
+        pfile_test = ("[packages]\n"
+                      "Flask = \"==0.11\"\n"
+                      "\n\n"
+                      "[dev-packages]\n"
+                      "pytest = \"*\"\n")
+
+        # Load test Pipfile.
+        p = toml.loads(pfile_test)
+        changed = ensure_proper_casing(p)
+
+        assert 'Flask' in p['packages']
+        assert 'pytest' in p['dev-packages']
+        assert changed is False
+
+    @pytest.mark.parametrize('shell, extension', [
+        ('/bin/bash', ''),
+        ('/bin/fish', '.fish'),
+        ('/bin/csh', '.csh'),
+        ('/bin/unknown', '')]
+    )
+    def test_activate_virtualenv(self, shell, extension):
+        orig_shell = os.environ['SHELL']
+        os.environ['SHELL'] = shell
+
+        # Get standard activation command for bash
+        command = activate_virtualenv()
+
+        # Return environment to initial shell config.
+        os.environ['SHELL'] = orig_shell
+
+        venv = Project().virtualenv_location
+        assert command == 'source {0}/bin/activate{1}'.format(venv, extension)
+
+    def test_activate_virtualenv_no_source(self):
+        command = activate_virtualenv(source=False)
+        venv = Project().virtualenv_location
+
+        assert command == '{0}/bin/activate'.format(venv)
+
+    @patch('pipenv.project.Project.sources', new_callable=PropertyMock)
+    @patch('delegator.run')
+    def test_pip_install_should_try_every_possible_source(self, mocked_delegator, mocked_sources):
+        sources = [
+            {'url': 'http://dontexistis.in.pypi/simple'},
+            {'url': 'http://existis.in.pypi/simple'}
+        ]
+        mocked_sources.return_value = sources
+        first_cmd_return = Mock()
+        first_cmd_return.return_code = 1
+        second_cmd_return = Mock()
+        second_cmd_return.return_code = 0
+        mocked_delegator.side_effect = [first_cmd_return, second_cmd_return]
+        c = pip_install('package')
+        assert c.return_code == 0
+
+    @patch('pipenv.project.Project.sources', new_callable=PropertyMock)
+    @patch('delegator.run')
+    def test_pip_install_should_return_the_last_error_if_no_cmd_worked(self, mocked_delegator, mocked_sources):
+        sources = [
+            {'url': 'http://dontexistis.in.pypi/simple'},
+            {'url': 'http://dontexistis.in.pypi/simple'}
+        ]
+        mocked_sources.return_value = sources
+        first_cmd_return = Mock()
+        first_cmd_return.return_code = 1
+        second_cmd_return = Mock()
+        second_cmd_return.return_code = 1
+        mocked_delegator.side_effect = [first_cmd_return, second_cmd_return]
+        c = pip_install('package')
+        assert c.return_code == 1
+        assert c == second_cmd_return
+
+    @patch('pipenv.project.Project.sources', new_callable=PropertyMock)
+    @patch('delegator.run')
+    def test_pip_install_should_return_the_first_cmd_that_worked(self, mocked_delegator, mocked_sources):
+        sources = [
+            {'url': 'http://existis.in.pypi/simple'},
+            {'url': 'http://existis.in.pypi/simple'}
+        ]
+        mocked_sources.return_value = sources
+        first_cmd_return = Mock()
+        first_cmd_return.return_code = 0
+        second_cmd_return = Mock()
+        second_cmd_return.return_code = 0
+        mocked_delegator.side_effect = [first_cmd_return, second_cmd_return]
+        c = pip_install('package')
+        assert c.return_code == 0
+        assert c == first_cmd_return
+
+    @patch('pipenv.project.Project.sources', new_callable=PropertyMock)
+    @patch('delegator.run')
+    def test_pip_download_should_try_every_possible_source(self, mocked_delegator, mocked_sources):
+        sources = [
+            {'url': 'http://dontexistis.in.pypi/simple'},
+            {'url': 'http://existis.in.pypi/simple'}
+        ]
+        mocked_sources.return_value = sources
+        first_cmd_return = Mock()
+        first_cmd_return.return_code = 1
+        second_cmd_return = Mock()
+        second_cmd_return.return_code = 0
+        mocked_delegator.side_effect = [first_cmd_return, second_cmd_return]
+        c = pip_download('package')
+        assert c.return_code == 0
+
+    @patch('pipenv.project.Project.sources', new_callable=PropertyMock)
+    @patch('delegator.run')
+    def test_pip_download_should_return_the_last_error_if_no_cmd_worked(self, mocked_delegator, mocked_sources):
+        sources = [
+            {'url': 'http://dontexistis.in.pypi/simple'},
+            {'url': 'http://dontexistis.in.pypi/simple'}
+        ]
+        mocked_sources.return_value = sources
+        first_cmd_return = Mock()
+        first_cmd_return.return_code = 1
+        second_cmd_return = Mock()
+        second_cmd_return.return_code = 1
+        mocked_delegator.side_effect = [first_cmd_return, second_cmd_return]
+        c = pip_download('package')
+        assert c.return_code == 1
+        assert c == second_cmd_return
+
+    @patch('pipenv.project.Project.sources', new_callable=PropertyMock)
+    @patch('delegator.run')
+    def test_pip_download_should_return_the_first_cmd_that_worked(self, mocked_delegator, mocked_sources):
+        sources = [
+            {'url': 'http://existis.in.pypi/simple'},
+            {'url': 'http://existis.in.pypi/simple'}
+        ]
+        mocked_sources.return_value = sources
+        first_cmd_return = Mock()
+        first_cmd_return.return_code = 0
+        second_cmd_return = Mock()
+        second_cmd_return.return_code = 0
+        mocked_delegator.side_effect = [first_cmd_return, second_cmd_return]
+        c = pip_download('package')
+        assert c.return_code == 0
+        assert c == first_cmd_return
+
+    def test_lock_requirements_file(self):
+        delegator.run('mkdir test_pipenv_requirements')
+        os.chdir('test_pipenv_requirements')
+
+        pip_str = ("[packages]\n"
+                   "requests = \"==2.14.0\"\n"
+                   "flask = \"==0.12.2\"\n\n"
+                   "[dev-packages]\n"
+                   "pytest = \"==3.1.1\"\n")
+
+        req_list = ("requests==2.14.0", "flask==0.12.2", "pytest==3.1.1")
+
+        # Build the environment.
+        os.environ['PIPENV_VENV_IN_PROJECT'] = '1'
+        assert delegator.run('echo \'{0}\' > Pipfile'.format(pip_str)).return_code == 0
+
+        # Validate requirements.txt.
+        c = delegator.run('pipenv lock -r')
+        assert c.return_code == 0
+        for req in req_list:
+            assert req in c.out
+
+        # Cleanup.
+        os.chdir('..')
+        delegator.run('rm -fr test_pipenv_requirements')

tests/test_pipenv.py

@@ -1,412 +1,359 @@
 import os
-
-from mock import patch, Mock, PropertyMock
-
-import pytest
+import tempfile
+import shutil
+import json
 from pipenv.vendor import toml
 from pipenv.vendor import delegator
 
-from pipenv.cli import (
-    activate_virtualenv, ensure_proper_casing, pip_install, pip_download
-)
-from pipenv.project import Project
+class PipenvInstance():
+    """docstring for PipenvInstance"""
+    def __init__(self, pipfile=True):
+        self.original_dir = os.path.abspath(os.curdir)
+        self.path = tempfile.mkdtemp(suffix='project', prefix='pipenv')
+        self.pipfile_path = None
 
-# Tell pipenv to ignore activated virtualenvs.
-os.environ['PIPENV_IGNORE_VIRTUALENVS'] = 'True'
+        if pipfile:
+            p_path = os.sep.join([self.path, 'Pipfile'])
+            with open(p_path, 'a'):
+                os.utime(p_path, None)
+
+            self.pipfile_path = p_path
+
+    def __enter__(self):
+        if not self.pipfile_path:
+            os.chdir(self.path)
+
+        return self
+
+    def __exit__(self, *args):
+        if not self.pipfile_path:
+            os.chdir(self.original_dir)
+
+        shutil.rmtree(self.path)
+
+    def pipenv(self, cmd, block=True):
+        if self.pipfile_path:
+            os.environ['PIPENV_PIPFILE'] = self.pipfile_path
+
+        c = delegator.run('pipenv {0}'.format(cmd), block=block)
+
+        if 'PIPENV_PIPFILE' in os.environ:
+            del os.environ['PIPENV_PIPFILE']
+
+        # Pretty output for failing tests.
+        if block:
+            print('$ pipenv {0}'.format(cmd))
+            print(c.out)
+            print(c.err)
+
+        # Where the action happens.
+        return c
+
+    @property
+    def pipfile(self):
+        p_path = os.sep.join([self.path, 'Pipfile'])
+        with open(p_path, 'r') as f:
+            return toml.loads(f.read())
+
+    @property
+    def lockfile(self):
+        p_path = os.sep.join([self.path, 'Pipfile.lock'])
+        with open(p_path, 'r') as f:
+            return json.loads(f.read())
 
 
-class TestPipenv():
+class TestPipenv:
+    """The ultimate testing class."""
 
-    def test_cli_usage(self):
-        delegator.run('mkdir test_project')
-        os.chdir('test_project')
+    def test_pipenv_where(self):
+        with PipenvInstance() as p:
+            assert p.path in p.pipenv('--where').out
 
+    def test_pipenv_venv(self):
+        with PipenvInstance() as p:
+            p.pipenv('--python python')
+            assert p.pipenv('--venv').out
+
+    def test_pipenv_py(self):
+        with PipenvInstance() as p:
+            p.pipenv('--python python')
+            assert p.pipenv('--py').out
+
+    def test_pipenv_rm(self):
+        with PipenvInstance() as p:
+            p.pipenv('--python python')
+            venv_path = p.pipenv('--venv').out
+
+            assert p.pipenv('--rm').out
+            assert not os.path.isdir(venv_path)
+
+    def test_pipenv_graph(self):
+        with PipenvInstance() as p:
+            p.pipenv('install requests')
+            assert 'requests' in p.pipenv('graph').out
+            assert 'requests' in p.pipenv('graph --json').out
+
+    # def test_pipenv_check(self):
+    #     with PipenvInstance() as p:
+    #         p.pipenv('install requests==1.0.0')
+    #         assert 'requests' in p.pipenv('check').out
+
+    def test_venv_envs(self):
+        with PipenvInstance() as p:
+            assert p.pipenv('--envs').out
+
+    def test_venv_jumbotron(self):
+        with PipenvInstance() as p:
+            assert p.pipenv('--jumbotron').out
+
+    def test_bare_output(self):
+        with PipenvInstance() as p:
+            assert p.pipenv('').out
+
+    def test_help(self):
+        with PipenvInstance() as p:
+            assert p.pipenv('--help').out
+
+    def test_basic_setup(self):
+        with PipenvInstance(pipfile=False) as p:
+            c = p.pipenv('install requests')
+            assert c.return_code == 0
+
+            assert 'requests' in p.pipfile['packages']
+            assert 'requests' in p.lockfile['default']
+            assert 'chardet' in p.lockfile['default']
+            assert 'idna' in p.lockfile['default']
+            assert 'urllib3' in p.lockfile['default']
+            assert 'certifi' in p.lockfile['default']
+
+    # def test_spell_checking(self):
+    #     with PipenvInstance() as p:
+    #         c = p.pipenv('install django-rest-framework', block=False)
+    #         c.expect('?')
+    #         c.send('y')
+    #         c.block()
+
+    #         assert c.return_code == 0
+    #         assert 'requests' in p.pipfile['djangorestframework']
+
+    def test_basic_install(self):
+        with PipenvInstance() as p:
+            c = p.pipenv('install requests')
+            assert c.return_code == 0
+            assert 'requests' in p.pipfile['packages']
+            assert 'requests' in p.lockfile['default']
+            assert 'chardet' in p.lockfile['default']
+            assert 'idna' in p.lockfile['default']
+            assert 'urllib3' in p.lockfile['default']
+            assert 'certifi' in p.lockfile['default']
+
+    def test_basic_dev_install(self):
+        with PipenvInstance() as p:
+            c = p.pipenv('install requests --dev')
+            assert c.return_code == 0
+            assert 'requests' in p.pipfile['dev-packages']
+            assert 'requests' in p.lockfile['develop']
+            assert 'chardet' in p.lockfile['develop']
+            assert 'idna' in p.lockfile['develop']
+            assert 'urllib3' in p.lockfile['develop']
+            assert 'certifi' in p.lockfile['develop']
+
+            c = p.pipenv('run python -m requests.help')
+            assert c.return_code == 0
+
+    def test_uninstall(self):
+        with PipenvInstance() as p:
+            c = p.pipenv('install requests')
+            assert c.return_code == 0
+            assert 'requests' in p.pipfile['packages']
+            assert 'requests' in p.lockfile['default']
+            assert 'chardet' in p.lockfile['default']
+            assert 'idna' in p.lockfile['default']
+            assert 'urllib3' in p.lockfile['default']
+            assert 'certifi' in p.lockfile['default']
+
+            c = p.pipenv('uninstall requests')
+            assert c.return_code == 0
+            assert 'requests' not in p.pipfile['dev-packages']
+            assert 'requests' not in p.lockfile['develop']
+            assert 'chardet' not in p.lockfile['develop']
+            assert 'idna' not in p.lockfile['develop']
+            assert 'urllib3' not in p.lockfile['develop']
+            assert 'certifi' not in p.lockfile['develop']
+
+            c = p.pipenv('run python -m requests.help')
+            assert c.return_code > 0
+
+    def test_extras_install(self):
+        with PipenvInstance() as p:
+            c = p.pipenv('install requests[socks]')
+            assert c.return_code == 0
+            assert 'requests' in p.pipfile['packages']
+            assert 'extras' in p.pipfile['packages']['requests']
+
+            assert 'requests' in p.lockfile['default']
+            assert 'chardet' in p.lockfile['default']
+            assert 'idna' in p.lockfile['default']
+            assert 'urllib3' in p.lockfile['default']
+            assert 'pysocks' in p.lockfile['default']
+
+    def test_basic_vcs_install(self):
+        with PipenvInstance() as p:
+            c = p.pipenv('install git+https://github.com/requests/requests.git#egg=requests')
+            assert c.return_code == 0
+            assert 'requests' in p.pipfile['packages']
+            assert 'git' in p.pipfile['packages']['requests']
+            assert p.lockfile['default']['requests'] == {"git": "https://github.com/requests/requests.git"}
+
+    def test_editable_vcs_install(self):
+        with PipenvInstance() as p:
+            c = p.pipenv('install -e git+https://github.com/requests/requests.git#egg=requests')
+            assert c.return_code == 0
+            assert 'requests' in p.pipfile['packages']
+            assert 'git' in p.pipfile['packages']['requests']
+            assert 'editable' in p.pipfile['packages']['requests']
+            assert 'editable' in p.lockfile['default']['requests']
+            assert 'chardet' in p.lockfile['default']
+            assert 'idna' in p.lockfile['default']
+            assert 'urllib3' in p.lockfile['default']
+            assert 'certifi' in p.lockfile['default']
+
+    def test_multiprocess_bug_and_install(self):
+        os.environ['PIPENV_MAX_SUBPROCESS'] = '2'
+
+        with PipenvInstance() as p:
+            with open(p.pipfile_path, 'w') as f:
+                contents = """
+[packages]
+requests = "*"
+records = "*"
+tpfd = "*"
+                """.strip()
+                f.write(contents)
+
+            c = p.pipenv('install')
+            assert c.return_code == 0
+
+            assert 'requests' in p.lockfile['default']
+            assert 'idna' in p.lockfile['default']
+            assert 'urllib3' in p.lockfile['default']
+            assert 'certifi' in p.lockfile['default']
+            assert 'records' in p.lockfile['default']
+            assert 'tpfd' in p.lockfile['default']
+            assert 'parse' in p.lockfile['default']
+
+            c = p.pipenv('run python -c "import requests; import idna; import certifi; import records; import tpfd; import parse;"')
+            assert c.return_code == 0
+
+            del os.environ['PIPENV_MAX_SUBPROCESS']
+
+    def test_sequential_mode(self):
+
+        with PipenvInstance() as p:
+            with open(p.pipfile_path, 'w') as f:
+                contents = """
+[packages]
+requests = "*"
+records = "*"
+tpfd = "*"
+                """.strip()
+                f.write(contents)
+
+            c = p.pipenv('install --sequential')
+            assert c.return_code == 0
+
+            assert 'requests' in p.lockfile['default']
+            assert 'idna' in p.lockfile['default']
+            assert 'urllib3' in p.lockfile['default']
+            assert 'certifi' in p.lockfile['default']
+            assert 'records' in p.lockfile['default']
+            assert 'tpfd' in p.lockfile['default']
+            assert 'parse' in p.lockfile['default']
+
+            c = p.pipenv('run python -c "import requests; import idna; import certifi; import records; import tpfd; import parse;"')
+            assert c.return_code == 0
+
+    def test_package_environment_markers(self):
+
+        with PipenvInstance() as p:
+            with open(p.pipfile_path, 'w') as f:
+                contents = """
+[packages]
+requests = {version = "*", markers="os_name=='splashwear'"}
+                """.strip()
+                f.write(contents)
+
+            c = p.pipenv('install')
+            assert c.return_code == 0
+
+            assert 'Ignoring' in c.out
+            assert 'markers' in p.lockfile['default']['requests']
+
+            c = p.pipenv('run python -c "import requests;"')
+            assert c.return_code == 1
+
+    def test_specific_package_environment_markers(self):
+
+        with PipenvInstance() as p:
+            with open(p.pipfile_path, 'w') as f:
+                contents = """
+[packages]
+requests = {version = "*", os_name = "== 'splashwear'"}
+                """.strip()
+                f.write(contents)
+
+            c = p.pipenv('install')
+            assert c.return_code == 0
+
+            assert 'Ignoring' in c.out
+            assert 'markers' in p.lockfile['default']['requests']
+
+            c = p.pipenv('run python -c "import requests;"')
+            assert c.return_code == 1
+
+    def test_alternative_version_specifier(self):
+
+        with PipenvInstance() as p:
+            with open(p.pipfile_path, 'w') as f:
+                contents = """
+[packages]
+requests = {version = "*"}
+                """.strip()
+                f.write(contents)
+
+            c = p.pipenv('install')
+            assert c.return_code == 0
+
+            assert 'requests' in p.lockfile['default']
+            assert 'idna' in p.lockfile['default']
+            assert 'urllib3' in p.lockfile['default']
+            assert 'certifi' in p.lockfile['default']
+            assert 'chardet' in p.lockfile['default']
+
+            c = p.pipenv('run python -c "import requests; import idna; import certifi;"')
+            assert c.return_code == 0
+
+    def test_bad_packages(self):
+        with PipenvInstance() as p:
+            c = p.pipenv('install python')
+            assert c.return_code > 0
+
+    def test_venv_in_project(self):
         os.environ['PIPENV_VENV_IN_PROJECT'] = '1'
+        with PipenvInstance() as p:
+            c = p.pipenv('install requests')
+            assert c.return_code == 0
+            assert p.path in p.pipenv('--venv').out
 
-        assert delegator.run('touch Pipfile').return_code == 0
+        del os.environ['PIPENV_VENV_IN_PROJECT']
 
-        assert delegator.run('pipenv --python python').return_code == 0
-        assert delegator.run('pipenv install Werkzeug').return_code == 0
-        assert delegator.run('pipenv install pytest --dev').return_code == 0
-        # assert delegator.run('pipenv install https://pypi.python.org/packages/49/df/50aa1999ab9bde74656c2919d9c0c085fd2b3775fd3eca826012bef76d8c/requests-2.18.4-py2.py3-none-any.whl#md5=eb9be71cc41fd73a51a7c9cd1adde5de').return_code == 0
+    def test_env(self):
+        with PipenvInstance(pipfile=False) as p:
+            with open('.env', 'w') as f:
+                f.write('HELLO=WORLD')
 
-        # Debug.
-        print(delegator.run('pipenv install regex').err)
+            c = p.pipenv('run python -c "import os; print(os.environ[\'HELLO\'])"')
+            assert c.return_code == 0
+            assert 'WORLD' in c.out
 
-        assert delegator.run('pipenv install regex').return_code == 0  # failing before
-        assert delegator.run('pipenv install git+https://github.com/requests/requests.git@v2.18.4#egg=requests').return_code == 0
-        assert delegator.run('pipenv lock').return_code == 0
-        assert delegator.run('pipenv update --dev --dry-run').return_code == 0
 
-        # Test uninstalling a package after locking.
-        assert delegator.run('pipenv uninstall Werkzeug').return_code == 0
-
-        pipfile_output = delegator.run('cat Pipfile').out
-        lockfile_output = delegator.run('cat Pipfile.lock').out
-
-        # Ensure uninstall works.
-        assert 'Werkzeug' not in pipfile_output
-        assert 'werkzeug' not in lockfile_output
-
-        # Ensure dev-packages work.
-        assert 'pytest' in pipfile_output
-        assert 'pytest' in lockfile_output
-
-        # Ensure vcs dependencies work.
-        assert 'requests' in pipfile_output
-        assert '"git": "https://github.com/requests/requests.git"' in lockfile_output
-
-        os.chdir('..')
-        delegator.run('rm -fr test_project')
-
-    def test_requirements_to_pipfile(self):
-        delegator.run('mkdir test_requirements_to_pip')
-        os.chdir('test_requirements_to_pip')
-
-        os.environ['PIPENV_VENV_IN_PROJECT'] = '1'
-        os.environ['PIPENV_MAX_DEPTH'] = '1'
-
-        with open('requirements.txt', 'w') as f:
-            f.write('requests[socks]==2.18.1\n'
-                    'git+https://github.com/kennethreitz/records.git@v0.5.0#egg=records\n'
-                    '-e git+https://github.com/kennethreitz/tablib.git@v0.11.5#egg=tablib\n'
-                    'six==1.10.0\n')
-
-        assert delegator.run('pipenv --python python').return_code == 0
-        print(delegator.run('pipenv lock').err)
-        assert delegator.run('pipenv lock').return_code == 0
-
-        pipfile_output = delegator.run('cat Pipfile').out
-        lockfile_output = delegator.run('cat Pipfile.lock').out
-
-        # Ensure extras work.
-        assert 'socks' in pipfile_output
-        assert 'pysocks' in lockfile_output
-
-        # Ensure vcs dependencies work.
-        assert 'records' in pipfile_output
-        assert '"git": "https://github.com/kennethreitz/records.git"' in lockfile_output
-
-        # Ensure editable packages work.
-        assert 'ref = "v0.11.5"' in pipfile_output
-        assert '"editable": true' in lockfile_output
-
-        # Ensure BAD_PACKAGES aren't copied into Pipfile from requirements.txt.
-        assert 'six = "==1.10.0"' not in pipfile_output
-
-        os.chdir('..')
-        delegator.run('rm -fr test_requirements_to_pip')
-        del os.environ['PIPENV_MAX_DEPTH']
-
-    def test_timeout_long(self):
-        delegator.run('mkdir test_timeout_long')
-        os.chdir('test_timeout_long')
-
-        os.environ['PIPENV_VENV_IN_PROJECT'] = '1'
-        os.environ['PIPENV_TIMEOUT'] = '60'
-
-        assert delegator.run('touch Pipfile').return_code == 0
-
-        assert delegator.run('pipenv --python python').return_code == 0
-
-        os.chdir('..')
-        delegator.run('rm -fr test_timeout_long')
-        del os.environ['PIPENV_TIMEOUT']
-
-    def test_timeout_short(self):
-        delegator.run('mkdir test_timeout_short')
-        os.chdir('test_timeout_short')
-
-        os.environ['PIPENV_VENV_IN_PROJECT'] = '1'
-        os.environ['PIPENV_TIMEOUT'] = '1'
-
-        assert delegator.run('touch Pipfile').return_code == 0
-
-        assert delegator.run('pipenv --python python').return_code == 1
-
-        os.chdir('..')
-        delegator.run('rm -fr test_timeout_short')
-        del os.environ['PIPENV_TIMEOUT']
-
-    def test_pipenv_uninstall(self):
-        delegator.run('mkdir test_pipenv_uninstall')
-        os.chdir('test_pipenv_uninstall')
-
-        # Build the environment.
-        os.environ['PIPENV_VENV_IN_PROJECT'] = '1'
-        assert delegator.run('touch Pipfile').return_code == 0
-        assert delegator.run('pipenv --python python').return_code == 0
-
-        # Add entries to Pipfile.
-        assert delegator.run('pipenv install Werkzeug').return_code == 0
-        assert delegator.run('pipenv install pytest --dev').return_code == 0
-
-        pipfile_output = delegator.run('cat Pipfile').out
-        pipfile_list = pipfile_output.split('\n')
-
-        assert 'werkzeug = "*"' in pipfile_list
-        assert 'pytest = "*"' in pipfile_list
-        assert '[packages]' in pipfile_list
-        assert '[dev-packages]' in pipfile_list
-
-        # Uninstall from dev-packages, removing TOML section.
-        assert delegator.run('pipenv uninstall pytest').return_code == 0
-
-        # Test uninstalling non-existant dependency.
-        c = delegator.run('pipenv uninstall NotAPackage')
-        assert c.return_code == 0
-        assert 'No package NotAPackage to remove from Pipfile.' in c.out
-
-        pipfile_output = delegator.run('cat Pipfile').out
-        pipfile_list = pipfile_output.split('\n')
-
-        assert 'Werkzeug = "*"' in pipfile_list
-        assert 'pytest = "*"' not in pipfile_list
-        assert '[packages]' in pipfile_list
-        # assert '[dev-packages]' not in pipfile_list
-
-        os.chdir('..')
-        delegator.run('rm -fr test_pipenv_uninstall')
-
-    def test_pipenv_uninstall_dev(self):
-        delegator.run('mkdir test_pipenv_uninstall_dev')
-        os.chdir('test_pipenv_uninstall_dev')
-
-        # Build the environment.
-        os.environ['PIPENV_VENV_IN_PROJECT'] = '1'
-        assert delegator.run('touch Pipfile').return_code == 0
-        assert delegator.run('pipenv --python python').return_code == 0
-
-        # Add entries to Pipfile.
-        assert delegator.run('pipenv install pytest --dev').return_code == 0
-
-        pipfile_output = delegator.run('cat Pipfile').out
-        pipfile_list = pipfile_output.split('\n')
-
-        assert '[dev-packages]' in pipfile_list
-        assert 'pytest = "*"' in pipfile_list
-
-        # Uninstall from dev-packages, removing TOML section.
-        assert delegator.run('pipenv uninstall -d pytest').return_code == 0
-
-        pipfile_output = delegator.run('cat Pipfile').out
-        pipfile_list = pipfile_output.split('\n')
-
-        assert 'pytest = "*"' not in pipfile_list
-
-        os.chdir('..')
-        delegator.run('rm -fr test_pipenv_uninstall_dev')
-
-    def test_pipenv_run(self):
-        working_dir = 'test_pipenv_run'
-        delegator.run('mkdir {0}'.format(working_dir))
-        os.chdir(working_dir)
-
-        # Build the environment.
-        os.environ['PIPENV_VENV_IN_PROJECT'] = '1'
-        delegator.run('touch Pipfile')
-
-        # Install packages for test.
-        # print(delegator.run('pipenv install pep8').err)
-        assert delegator.run('pipenv install pep8').return_code == 0
-        assert delegator.run('pipenv install pytest').return_code == 0
-
-        # Run test commands.
-        assert delegator.run('pipenv run python -c \'print("test")\'').return_code == 0
-        assert delegator.run('pipenv run pep8 --version').return_code == 0
-        assert delegator.run('pipenv run pytest --version').return_code == 0
-
-        os.chdir('..')
-        delegator.run('rm -fr {0}'.format(working_dir))
-
-    def test_ensure_proper_casing_names(self):
-        """Ensure proper casing for package names."""
-        pfile_test = ("[packages]\n"
-                      "DjAnGO = \"*\"\n"
-                      "flask = \"==0.11\"\n"
-                      "\n\n"
-                      "[dev-packages]\n"
-                      "PyTEST = \"*\"\n")
-
-        # Load test Pipfile.
-        p = toml.loads(pfile_test)
-
-        assert 'DjAnGO' in p['packages']
-        assert 'PyTEST' in p['dev-packages']
-
-        changed = ensure_proper_casing(p)
-
-        assert 'Django' in p['packages']
-        assert 'DjAnGO' not in p['packages']
-
-        assert 'pytest' in p['dev-packages']
-        assert 'PyTEST' not in p['dev-packages']
-
-        assert changed is True
-
-    def test_ensure_proper_casing_no_change(self):
-        """Ensure changed flag is false with no changes."""
-        pfile_test = ("[packages]\n"
-                      "Flask = \"==0.11\"\n"
-                      "\n\n"
-                      "[dev-packages]\n"
-                      "pytest = \"*\"\n")
-
-        # Load test Pipfile.
-        p = toml.loads(pfile_test)
-        changed = ensure_proper_casing(p)
-
-        assert 'Flask' in p['packages']
-        assert 'pytest' in p['dev-packages']
-        assert changed is False
-
-    @pytest.mark.parametrize('shell, extension', [
-        ('/bin/bash', ''),
-        ('/bin/fish', '.fish'),
-        ('/bin/csh', '.csh'),
-        ('/bin/unknown', '')]
-    )
-    def test_activate_virtualenv(self, shell, extension):
-        orig_shell = os.environ['SHELL']
-        os.environ['SHELL'] = shell
-
-        # Get standard activation command for bash
-        command = activate_virtualenv()
-
-        # Return environment to initial shell config.
-        os.environ['SHELL'] = orig_shell
-
-        venv = Project().virtualenv_location
-        assert command == 'source {0}/bin/activate{1}'.format(venv, extension)
-
-    def test_activate_virtualenv_no_source(self):
-        command = activate_virtualenv(source=False)
-        venv = Project().virtualenv_location
-
-        assert command == '{0}/bin/activate'.format(venv)
-
-    @patch('pipenv.project.Project.sources', new_callable=PropertyMock)
-    @patch('delegator.run')
-    def test_pip_install_should_try_every_possible_source(self, mocked_delegator, mocked_sources):
-        sources = [
-            {'url': 'http://dontexistis.in.pypi/simple'},
-            {'url': 'http://existis.in.pypi/simple'}
-        ]
-        mocked_sources.return_value = sources
-        first_cmd_return = Mock()
-        first_cmd_return.return_code = 1
-        second_cmd_return = Mock()
-        second_cmd_return.return_code = 0
-        mocked_delegator.side_effect = [first_cmd_return, second_cmd_return]
-        c = pip_install('package')
-        assert c.return_code == 0
-
-    @patch('pipenv.project.Project.sources', new_callable=PropertyMock)
-    @patch('delegator.run')
-    def test_pip_install_should_return_the_last_error_if_no_cmd_worked(self, mocked_delegator, mocked_sources):
-        sources = [
-            {'url': 'http://dontexistis.in.pypi/simple'},
-            {'url': 'http://dontexistis.in.pypi/simple'}
-        ]
-        mocked_sources.return_value = sources
-        first_cmd_return = Mock()
-        first_cmd_return.return_code = 1
-        second_cmd_return = Mock()
-        second_cmd_return.return_code = 1
-        mocked_delegator.side_effect = [first_cmd_return, second_cmd_return]
-        c = pip_install('package')
-        assert c.return_code == 1
-        assert c == second_cmd_return
-
-    @patch('pipenv.project.Project.sources', new_callable=PropertyMock)
-    @patch('delegator.run')
-    def test_pip_install_should_return_the_first_cmd_that_worked(self, mocked_delegator, mocked_sources):
-        sources = [
-            {'url': 'http://existis.in.pypi/simple'},
-            {'url': 'http://existis.in.pypi/simple'}
-        ]
-        mocked_sources.return_value = sources
-        first_cmd_return = Mock()
-        first_cmd_return.return_code = 0
-        second_cmd_return = Mock()
-        second_cmd_return.return_code = 0
-        mocked_delegator.side_effect = [first_cmd_return, second_cmd_return]
-        c = pip_install('package')
-        assert c.return_code == 0
-        assert c == first_cmd_return
-
-    @patch('pipenv.project.Project.sources', new_callable=PropertyMock)
-    @patch('delegator.run')
-    def test_pip_download_should_try_every_possible_source(self, mocked_delegator, mocked_sources):
-        sources = [
-            {'url': 'http://dontexistis.in.pypi/simple'},
-            {'url': 'http://existis.in.pypi/simple'}
-        ]
-        mocked_sources.return_value = sources
-        first_cmd_return = Mock()
-        first_cmd_return.return_code = 1
-        second_cmd_return = Mock()
-        second_cmd_return.return_code = 0
-        mocked_delegator.side_effect = [first_cmd_return, second_cmd_return]
-        c = pip_download('package')
-        assert c.return_code == 0
-
-    @patch('pipenv.project.Project.sources', new_callable=PropertyMock)
-    @patch('delegator.run')
-    def test_pip_download_should_return_the_last_error_if_no_cmd_worked(self, mocked_delegator, mocked_sources):
-        sources = [
-            {'url': 'http://dontexistis.in.pypi/simple'},
-            {'url': 'http://dontexistis.in.pypi/simple'}
-        ]
-        mocked_sources.return_value = sources
-        first_cmd_return = Mock()
-        first_cmd_return.return_code = 1
-        second_cmd_return = Mock()
-        second_cmd_return.return_code = 1
-        mocked_delegator.side_effect = [first_cmd_return, second_cmd_return]
-        c = pip_download('package')
-        assert c.return_code == 1
-        assert c == second_cmd_return
-
-    @patch('pipenv.project.Project.sources', new_callable=PropertyMock)
-    @patch('delegator.run')
-    def test_pip_download_should_return_the_first_cmd_that_worked(self, mocked_delegator, mocked_sources):
-        sources = [
-            {'url': 'http://existis.in.pypi/simple'},
-            {'url': 'http://existis.in.pypi/simple'}
-        ]
-        mocked_sources.return_value = sources
-        first_cmd_return = Mock()
-        first_cmd_return.return_code = 0
-        second_cmd_return = Mock()
-        second_cmd_return.return_code = 0
-        mocked_delegator.side_effect = [first_cmd_return, second_cmd_return]
-        c = pip_download('package')
-        assert c.return_code == 0
-        assert c == first_cmd_return
-
-    def test_lock_requirements_file(self):
-        delegator.run('mkdir test_pipenv_requirements')
-        os.chdir('test_pipenv_requirements')
-
-        pip_str = ("[packages]\n"
-                   "requests = \"==2.14.0\"\n"
-                   "flask = \"==0.12.2\"\n\n"
-                   "[dev-packages]\n"
-                   "pytest = \"==3.1.1\"\n")
-
-        req_list = ("requests==2.14.0", "flask==0.12.2", "pytest==3.1.1")
-
-        # Build the environment.
-        os.environ['PIPENV_VENV_IN_PROJECT'] = '1'
-        assert delegator.run('echo \'{0}\' > Pipfile'.format(pip_str)).return_code == 0
-
-        # Validate requirements.txt.
-        c = delegator.run('pipenv lock -r')
-        assert c.return_code == 0
-        for req in req_list:
-            assert req in c.out
-
-        # Cleanup.
-        os.chdir('..')
-        delegator.run('rm -fr test_pipenv_requirements')

tests/test_project.py

@@ -3,13 +3,7 @@ from pipenv.vendor import delegator
 
 
 class TestProject():
-
-    def test_project(self):
-        proj = pipenv.project.Project()
-
-        assert proj.pipfile_exists
-        assert proj.virtualenv_exists
-
+    
     def test_proper_names(self):
         proj = pipenv.project.Project()
         assert proj.virtualenv_location in proj.proper_names_location