Don't run test_nose_image_comparison in parallel.
These tests overwrite certain names that causes issues when testing in parallel. These tests will be gone with Matplotlib 3.0, so I don't want to spend much time fixing them. Just ignore them and run in serial afterwards.
This commit is contained in:
parent
a6c4a06cef
commit
20e40c3953
@ -475,7 +475,7 @@ PYTHONDONTWRITEBYTECODE=1 \
|
||||
xvfb-run -a -s "-screen 0 640x480x24" \
|
||||
%{__python2} -m pytest --pyargs matplotlib -ra -n $(getconf _NPROCESSORS_ONLN) \
|
||||
-m 'not network' \
|
||||
-k 'not test_invisible_Line_rendering and not test_parasite and not test_polycollection_close'
|
||||
-k 'not test_invisible_Line_rendering and not test_parasite and not test_polycollection_close and not test_nose_image_comparison'
|
||||
|
||||
MPLCONFIGDIR=$PWD \
|
||||
MATPLOTLIBDATA=%{buildroot}%{_datadir}/matplotlib/mpl-data \
|
||||
@ -484,7 +484,23 @@ PYTHONDONTWRITEBYTECODE=1 \
|
||||
xvfb-run -a -s "-screen 0 640x480x24" \
|
||||
%{__python3} tests.py -ra -n $(getconf _NPROCESSORS_ONLN) \
|
||||
-m 'not network' \
|
||||
-k 'not test_invisible_Line_rendering'
|
||||
-k 'not test_invisible_Line_rendering and not test_nose_image_comparison'
|
||||
|
||||
# We run these separately because they have issues when run in parallel.
|
||||
MPLCONFIGDIR=$PWD \
|
||||
MATPLOTLIBDATA=%{buildroot}%{_datadir}/matplotlib/mpl-data \
|
||||
PYTHONPATH=%{buildroot}%{python2_sitearch} \
|
||||
PYTHONDONTWRITEBYTECODE=1 \
|
||||
xvfb-run -a -s "-screen 0 640x480x24" \
|
||||
%{__python2} -m pytest --pyargs matplotlib -ra \
|
||||
-k 'test_nose_image_comparison'
|
||||
MPLCONFIGDIR=$PWD \
|
||||
MATPLOTLIBDATA=%{buildroot}%{_datadir}/matplotlib/mpl-data \
|
||||
PYTHONPATH=%{buildroot}%{python3_sitearch} \
|
||||
PYTHONDONTWRITEBYTECODE=1 \
|
||||
xvfb-run -a -s "-screen 0 640x480x24" \
|
||||
%{__python3} tests.py -ra \
|
||||
-k 'test_nose_image_comparison'
|
||||
%endif # run_tests
|
||||
|
||||
%files -n python-matplotlib-data
|
||||
|
Loading…
Reference in New Issue
Block a user