summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPradyun Gedam <pradyunsg@gmail.com>2018-06-19 01:00:25 +0530
committerPradyun Gedam <pradyunsg@gmail.com>2018-06-19 16:27:07 +0530
commitfdd51011288312757c618039e632b40d4df56d23 (patch)
treedaed027ea950a15da4d33efdfe46bf6dca22f347
parent0eb566fa8236d340a1a9e52c41ff9d96493e762d (diff)
downloadpip-fdd51011288312757c618039e632b40d4df56d23.tar.gz
Cleanup Tests
-rw-r--r--tests/data/src/pep518_invalid_requires/setup.cfg0
-rw-r--r--tests/data/src/pep518_invalid_requires/setup.py11
-rw-r--r--tests/data/src/pep518_missing_requires/setup.cfg0
-rw-r--r--tests/data/src/pep518_missing_requires/setup.py11
-rw-r--r--tests/functional/test_install.py22
5 files changed, 15 insertions, 29 deletions
diff --git a/tests/data/src/pep518_invalid_requires/setup.cfg b/tests/data/src/pep518_invalid_requires/setup.cfg
deleted file mode 100644
index e69de29bb..000000000
--- a/tests/data/src/pep518_invalid_requires/setup.cfg
+++ /dev/null
diff --git a/tests/data/src/pep518_invalid_requires/setup.py b/tests/data/src/pep518_invalid_requires/setup.py
index b63f59926..e8a92da31 100644
--- a/tests/data/src/pep518_invalid_requires/setup.py
+++ b/tests/data/src/pep518_invalid_requires/setup.py
@@ -1,9 +1,8 @@
#!/usr/bin/env python
from setuptools import setup
-import simplewheel # ensure dependency is installed
-
-setup(name='pep518',
- version='3.0',
- py_modules=['pep518'],
- )
+setup(
+ name='pep518_invalid_requires',
+ version='1.0.0',
+ py_modules=['pep518'],
+)
diff --git a/tests/data/src/pep518_missing_requires/setup.cfg b/tests/data/src/pep518_missing_requires/setup.cfg
deleted file mode 100644
index e69de29bb..000000000
--- a/tests/data/src/pep518_missing_requires/setup.cfg
+++ /dev/null
diff --git a/tests/data/src/pep518_missing_requires/setup.py b/tests/data/src/pep518_missing_requires/setup.py
index b63f59926..cbc5d28af 100644
--- a/tests/data/src/pep518_missing_requires/setup.py
+++ b/tests/data/src/pep518_missing_requires/setup.py
@@ -1,9 +1,8 @@
#!/usr/bin/env python
from setuptools import setup
-import simplewheel # ensure dependency is installed
-
-setup(name='pep518',
- version='3.0',
- py_modules=['pep518'],
- )
+setup(
+ name='pep518_missing_requires',
+ version='1.0.0',
+ py_modules=['pep518'],
+)
diff --git a/tests/functional/test_install.py b/tests/functional/test_install.py
index b1944cb71..2a97f9216 100644
--- a/tests/functional/test_install.py
+++ b/tests/functional/test_install.py
@@ -37,24 +37,12 @@ def test_pep518_uses_build_env(script, data, common_wheels, command, variant):
)
-def test_pep518_refuses_missing_requires(script, data, common_wheels):
- result = script.pip(
- 'install',
- '-f', common_wheels,
- '-f', data.find_links,
- data.src.join("pep518_missing_requires"),
- expect_error=True
- )
- assert result.returncode == 1
- assert "does not comply with PEP 518" in result.stderr
-
-
-def test_pep518_refuses_invalid_requires(script, data, common_wheels):
+@pytest.mark.parametrize(
+ "package", ["pep518_invalid_requires", "pep518_missing_requires"]
+)
+def test_pep518_refuses_invalid_requires(script, data, common_wheels, package):
result = script.pip(
- 'install',
- '-f', common_wheels,
- '-f', data.find_links,
- data.src.join("pep518_invalid_requires"),
+ 'install', '-f', common_wheels, data.src.join(package),
expect_error=True
)
assert result.returncode == 1