rpms/python-rpm-macros
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Allow multiline arguments processing for %%py3_check_import

Browse source 
Fixes the regression introduced with the macro reimplementation.
Resolves: rhbz#2018809
This commit is contained in:
Karolina Surma 2021-11-01 09:42:39 +01:00
commit aa7cf4e2bd
6 changed files with 33 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

22
tests/test_evals.py
View file

@ -622,20 +622,22 @@ def test_python3_sitearch_value(lib):
@pytest.mark.parametrize(
'args',
'args, expected_args',
[
'six',
'-f foo.txt',
'-t -f foo.txt six, seven',
'-e "foo*" -f foo.txt six, seven',
'six.quarter six.half,, SIX',
('six', 'six'),
('-f foo.txt', '-f foo.txt'),
('-t -f foo.txt six, seven', '-t -f foo.txt six, seven'),
('-e "foo*" -f foo.txt six, seven', '-e "foo*" -f foo.txt six, seven'),
('six.quarter six.half,, SIX', 'six.quarter six.half,, SIX'),
('-f foo.txt six\nsix.half\nSIX', '-f foo.txt six six.half SIX'),
('six \\ -e six.half', 'six -e six.half'),
]
)
@pytest.mark.parametrize('__python3',
[None,
f'/usr/bin/python{X_Y}',
'/usr/bin/python3.6'])
def test_py3_check_import(args, __python3, lib):
def test_py3_check_import(args, expected_args, __python3, lib):
x_y = X_Y
macros = {
'buildroot': 'BUILDROOT',
@ -650,7 +652,8 @@ def test_py3_check_import(args, __python3, lib):
if (match := re.match(r'.+python(\d+\.\d+)$', __python3)):
x_y = match.group(1)
lines = rpm_eval(f'%py3_check_import {args}', **macros)
invocation = '%{py3_check_import ' + args +'}'
lines = rpm_eval(invocation, **macros)
# An equality check is a bit inflexible here,
# every time we change the macro we need to change this test.
@ -661,6 +664,7 @@ def test_py3_check_import(args, __python3, lib):
PATH="BUILDROOT/usr/bin:$PATH"
PYTHONPATH="${{PYTHONPATH:-BUILDROOT/usr/{lib}/python{x_y}/site-packages:BUILDROOT/usr/lib/python{x_y}/site-packages}}"
PYTHONDONTWRITEBYTECODE=1
{__python3 or '/usr/bin/python3'} -s RPMCONFIGDIR/redhat/import_all_modules.py {args}
{__python3 or '/usr/bin/python3'} -s RPMCONFIGDIR/redhat/import_all_modules.py
{expected_args}
""")
assert lines == expected.splitlines()

1
tests/test_import_all_modules.py
View file

@ -30,6 +30,7 @@ def preserve_sys_modules():
('five six seven', ['five', 'six', 'seven']),
('six,seven, eight', ['six', 'seven', 'eight']),
('six.quarter six.half,, SIX', ['six.quarter', 'six.half', 'SIX']),
('six.quarter six.half,, SIX \\ ', ['six.quarter', 'six.half', 'SIX']),
]
)
def test_read_modules_from_cli(args, imports):