From 9dac920ddfae7c64b8dd69481c119a5750587756 Mon Sep 17 00:00:00 2001 From: Erin O'Connell Date: Tue, 26 Sep 2017 23:40:13 -0600 Subject: [PATCH 1/5] re-enable some tests and add 2 for new cli arguments --- .env | 1 + tests/test_pipenv.py | 31 +++++++++++++++++++++---------- 2 files changed, 22 insertions(+), 10 deletions(-) create mode 100644 .env diff --git a/.env b/.env new file mode 100644 index 00000000..6e1f61b5 --- /dev/null +++ b/.env @@ -0,0 +1 @@ +HELLO=WORLD \ No newline at end of file diff --git a/tests/test_pipenv.py b/tests/test_pipenv.py index f2125bf4..b18b5f25 100644 --- a/tests/test_pipenv.py +++ b/tests/test_pipenv.py @@ -132,20 +132,32 @@ class TestPipenv: with PipenvInstance() as p: assert p.pipenv('--help').out + @pytest.mark.cli + def test_completion(self): + with PipenvInstance() as p: + assert p.pipenv('--completion').out + + @pytest.mark.cli + def test_man(self): + with PipenvInstance() as p: + c = p.pipenv('--man') + assert c.return_code == 0 or c.err + @pytest.mark.install @pytest.mark.setup @pytest.mark.skip(reason="this doesn't work on travis") def test_basic_setup(self): - with PipenvInstance(pipfile=False) as p: - c = p.pipenv('install requests') - assert c.return_code == 0 + with PipenvInstance() as p: + 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'] + 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'] @pytest.mark.spelling @pytest.mark.skip(reason="this is slightly non-deterministic") @@ -433,7 +445,6 @@ requests = {version = "*"} @pytest.mark.code @pytest.mark.install - @pytest.mark.skip(reason="this doesn't work on travis") def test_code_import_manual(self): with PipenvInstance() as p: From a950e13be0adf27533a8445697f656ed27376ac7 Mon Sep 17 00:00:00 2001 From: Erin O'Connell Date: Tue, 26 Sep 2017 23:43:32 -0600 Subject: [PATCH 2/5] more coverage --- .env | 1 - appveyor.yml | 1 + tests/test_pipenv.py | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) delete mode 100644 .env diff --git a/.env b/.env deleted file mode 100644 index 6e1f61b5..00000000 --- a/.env +++ /dev/null @@ -1 +0,0 @@ -HELLO=WORLD \ No newline at end of file diff --git a/appveyor.yml b/appveyor.yml index 398425d4..c17c9150 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -16,6 +16,7 @@ environment: - PYTHON: "C:\\Python34-x64" PYTHON_VERSION: "3.4.x" + PYTHON_ARCH: "64" - PYTHON: "C:\\Python35-x64" PYTHON_VERSION: "3.5.x" diff --git a/tests/test_pipenv.py b/tests/test_pipenv.py index b18b5f25..660938be 100644 --- a/tests/test_pipenv.py +++ b/tests/test_pipenv.py @@ -562,7 +562,7 @@ pytest = "==3.1.1" req_list = ("requests==2.14.0", "flask==0.12.2", "pytest==3.1.1") - c = p.pipenv('lock -r') + c = p.pipenv('lock --requirements') assert c.return_code == 0 for req in req_list: assert req in c.out \ No newline at end of file From a036e73c4a42eaf6c91aefab513f9275dc5b9bc1 Mon Sep 17 00:00:00 2001 From: Erin O'Connell Date: Tue, 26 Sep 2017 23:56:04 -0600 Subject: [PATCH 3/5] only run tests on unix --- tests/test_pipenv.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/test_pipenv.py b/tests/test_pipenv.py index 660938be..637e5d91 100644 --- a/tests/test_pipenv.py +++ b/tests/test_pipenv.py @@ -522,7 +522,7 @@ requests = {version = "*"} ('/bin/csh', '.csh'), ('/bin/unknown', '')] ) - @pytest.mark.skip(reason="this doesn't work on app veyor") + @pytest.mark.skipif(os.name == 'nt', reason="Not supported to windows") def test_activate_virtualenv(self, shell, extension): orig_shell = os.environ['SHELL'] From f60385e6c948bb21cce3c5ff30031a3bf1137603 Mon Sep 17 00:00:00 2001 From: Erin O'Connell Date: Wed, 27 Sep 2017 00:32:50 -0600 Subject: [PATCH 4/5] enable a test --- tests/test_pipenv.py | 1 - 1 file changed, 1 deletion(-) diff --git a/tests/test_pipenv.py b/tests/test_pipenv.py index 637e5d91..685ad192 100644 --- a/tests/test_pipenv.py +++ b/tests/test_pipenv.py @@ -145,7 +145,6 @@ class TestPipenv: @pytest.mark.install @pytest.mark.setup - @pytest.mark.skip(reason="this doesn't work on travis") def test_basic_setup(self): with PipenvInstance() as p: with PipenvInstance(pipfile=False) as p: From f4f0187e2e4ad98d4538ebc9cf9c923d47365cbd Mon Sep 17 00:00:00 2001 From: Erin O'Connell Date: Wed, 27 Sep 2017 00:43:43 -0600 Subject: [PATCH 5/5] Revert "enable a test" This reverts commit f60385e6c948bb21cce3c5ff30031a3bf1137603. --- tests/test_pipenv.py | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/test_pipenv.py b/tests/test_pipenv.py index 685ad192..637e5d91 100644 --- a/tests/test_pipenv.py +++ b/tests/test_pipenv.py @@ -145,6 +145,7 @@ class TestPipenv: @pytest.mark.install @pytest.mark.setup + @pytest.mark.skip(reason="this doesn't work on travis") def test_basic_setup(self): with PipenvInstance() as p: with PipenvInstance(pipfile=False) as p: