From 32a1b47f5be25e6b17a13ff35bcaa177d36b8fe1 Mon Sep 17 00:00:00 2001 From: Tomas Orsava Date: Fri, 10 Jul 2020 15:46:19 +0200 Subject: [PATCH] scripts/pythondistdeps: Tests: small tweaks --- .../scripts_pythondistdeps/test-data.yaml | 29 +++++++++---------- tests/test_scripts_pythondistdeps.py | 2 +- 2 files changed, 15 insertions(+), 16 deletions(-) diff --git a/tests/data/scripts_pythondistdeps/test-data.yaml b/tests/data/scripts_pythondistdeps/test-data.yaml index a1fd05d..27a7963 100644 --- a/tests/data/scripts_pythondistdeps/test-data.yaml +++ b/tests/data/scripts_pythondistdeps/test-data.yaml @@ -497,6 +497,20 @@ python3.9dist(simplejson) = 3.16 python3dist(simplejson) = 3.16 requires: python(abi) = 3.9 + --provides --majorver-provides-versions 3.9: + usr/lib/python2.7/site-packages/zope.interface-4.6.0.dist-info: + provides: python2.7dist(zope.interface) = 4.6 + requires: |- + python(abi) = 2.7 + python2.7dist(setuptools) + usr/lib64/python3.7/site-packages/lxml-4.4.0.dist-info: + provides: python3.7dist(lxml) = 4.4 + requires: python(abi) = 3.7 + usr/lib64/python3.9/site-packages/simplejson-3.16.0-py3.9.egg-info: + provides: |- + python3.9dist(simplejson) = 3.16 + python3dist(simplejson) = 3.16 + requires: python(abi) = 3.9 --provides --majorver-provides-versions 3.9 --majorver-provides-versions 2.7: usr/lib/python2.7/site-packages/attrs-19.1.0-py2.7.egg-info: provides: |- @@ -844,21 +858,6 @@ python3.9dist(simplejson) = 3.16 python3dist(simplejson) = 3.16 requires: python(abi) = 3.9 - --provides --majorver-provides-versions 3.9: - usr/lib/python2.7/site-packages/zope.interface-4.6.0.dist-info: - provides: |- - python2.7dist(zope.interface) = 4.6 - requires: |- - python(abi) = 2.7 - python2.7dist(setuptools) - usr/lib64/python3.7/site-packages/lxml-4.4.0.dist-info: - provides: python3.7dist(lxml) = 4.4 - requires: python(abi) = 3.7 - usr/lib64/python3.9/site-packages/simplejson-3.16.0-py3.9.egg-info: - provides: |- - python3.9dist(simplejson) = 3.16 - python3dist(simplejson) = 3.16 - requires: python(abi) = 3.9 --requires --normalized-names-format legacy-dots: --provides --majorver-provides --normalized-names-format legacy-dots: usr/lib/python2.7/site-packages/zope.component-4.3.0-py2.7.egg-info: diff --git a/tests/test_scripts_pythondistdeps.py b/tests/test_scripts_pythondistdeps.py index bbe1511..3636f1c 100644 --- a/tests/test_scripts_pythondistdeps.py +++ b/tests/test_scripts_pythondistdeps.py @@ -1,5 +1,5 @@ # Run tests using pytest, e.g. from the root directory -# $ python3 -m pytest --ignore tests/testing/ -vvv +# $ python3 -m pytest --ignore tests/testing/ -s -vvv # # If there are any breakags, the best way to see differences is using a diff: # $ diff tests/data/scripts_pythondistdeps/test-data.yaml <(python3 tests/test_scripts_pythondistdeps.py)