vim-python310-new-errmsg.patch: adjust test suite to Python 3.10

New Python 3.10 changes its error messages, which breaks matching
in the test suite...
This commit is contained in:
Zdenek Dohnal 2021-10-15 06:38:39 +02:00
parent 823efb9c96
commit 2cb80dd52c
2 changed files with 22 additions and 0 deletions

View File

@ -0,0 +1,13 @@
diff --git a/src/testdir/test_python3.vim b/src/testdir/test_python3.vim
index 66d5db5..a7b3570 100644
--- a/src/testdir/test_python3.vim
+++ b/src/testdir/test_python3.vim
@@ -3094,7 +3094,7 @@ func Test_python3_errors()
<<< Finished
> VimForeachRTP
vim.foreach_rtp(None):(<class 'TypeError'>, TypeError("'NoneType' object is not callable",))
- vim.foreach_rtp(NoArgsCall()):(<class 'TypeError'>, TypeError('__call__() takes exactly 1 positional argument (2 given)',))
+ vim.foreach_rtp(NoArgsCall()):(<class 'TypeError'>, TypeError('__call__() takes 1 positional argument but 2 were given',))
vim.foreach_rtp(FailingCall()):(<class 'NotImplementedError'>, NotImplementedError('call',))
vim.foreach_rtp(int, 2):(<class 'TypeError'>, TypeError('foreach_rtp() takes exactly one argument (2 given)',))
> import

View File

@ -70,6 +70,8 @@ Patch3005: vim-python3-tests.patch
Patch3006: vim-crypto-warning.patch Patch3006: vim-crypto-warning.patch
# don't ever set mouse (Fedora downstream patch) # don't ever set mouse (Fedora downstream patch)
Patch3007: vim-8.0-copy-paste.patch Patch3007: vim-8.0-copy-paste.patch
# F35+: Python changed the error message which test suite expects
Patch3008: vim-python310-new-errmsg.patch
# uses autoconf in spec file # uses autoconf in spec file
@ -331,6 +333,10 @@ perl -pi -e "s,bin/nawk,bin/awk,g" runtime/tools/mve.awk
%patch3006 -p1 -b .fips-warning %patch3006 -p1 -b .fips-warning
%patch3007 -p1 -b .copypaste %patch3007 -p1 -b .copypaste
%if 0%{?fedora} >= 35
%patch3008 -p1 -b .python310-new-errmsg
%endif
%build %build
cd src cd src
autoconf autoconf
@ -897,6 +903,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags
%endif %endif
%changelog %changelog
* Thu Oct 14 2021 Zdenek Dohnal <zdohnal@redhat.com> - 2:8.2.3404-2
- adjust test suite to Python 3.10
* Thu Oct 14 2021 Zdenek Dohnal <zdohnal@redhat.com> - 2:8.2.3404-2 * Thu Oct 14 2021 Zdenek Dohnal <zdohnal@redhat.com> - 2:8.2.3404-2
- remove filetype plugin from virc - it doesn't work with vi - remove filetype plugin from virc - it doesn't work with vi