diff options
| author | Bram Moolenaar <Bram@vim.org> | 2021-07-08 11:37:50 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2021-07-08 11:37:50 +0200 |
| commit | db8647277082a8a69a189ded8bd1408af993b54e (patch) | |
| tree | de2f1847fb3177e56352aad2c8e3bd65b76914fe /src | |
| parent | 6a9e5c69cf36676e65ae191264872a3e41bde37f (diff) | |
| download | vim-git-db8647277082a8a69a189ded8bd1408af993b54e.tar.gz | |
patch 8.2.3120: crypt with sodium test fails on MS-Windowsv8.2.3120
Problem: Crypt with sodium test fails on MS-Windows.
Solution: Make the tests pass. (closes #8428)
Diffstat (limited to 'src')
| -rw-r--r-- | src/testdir/test_crypt.vim | 7 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 7 insertions, 2 deletions
diff --git a/src/testdir/test_crypt.vim b/src/testdir/test_crypt.vim index 63bf8a5b2..a18dfa3d1 100644 --- a/src/testdir/test_crypt.vim +++ b/src/testdir/test_crypt.vim @@ -124,6 +124,7 @@ endfunc func Test_uncrypt_xchacha20_invalid() CheckFeature sodium + " load an invalid encrypted file and verify it can be decrypted with an " error message try @@ -142,6 +143,7 @@ endfunc func Test_uncrypt_xchacha20_2() CheckFeature sodium + sp Xcrypt_sodium.txt " Create a larger file, so that Vim will write in several blocks call setline(1, range(1,4000)) @@ -159,7 +161,7 @@ func Test_uncrypt_xchacha20_2() " successfully decrypted call assert_equal(range(1, 4000)->map( {_, v -> string(v)}), getline(1,'$')) set key= - w! + w! ++ff=unix " enryption removed call assert_match('"Xcrypt_sodium.txt" 4000L, 18893B written', execute(':message')) bw! @@ -170,6 +172,7 @@ endfunc func Test_uncrypt_xchacha20_3_persistent_undo() CheckFeature sodium CheckFeature persistent_undo + sp Xcrypt_sodium_undo.txt set cryptmethod=xchacha20 undofile call feedkeys(":X\<CR>sodium\<CR>sodium\<CR>", 'xt') @@ -191,7 +194,7 @@ func Test_uncrypt_xchacha20_3_persistent_undo() " should fail norm! u call assert_match('Already at oldest change', execute(':1mess')) - call assert_fails('verbose rundo' .. fnameescape(ufile), 'E822') + call assert_fails('verbose rundo ' .. fnameescape(ufile), 'E822') bw! set undolevels& cryptmethod& undofile& call delete('Xcrypt_sodium_undo.txt') diff --git a/src/version.c b/src/version.c index 03e2546c6..39edf551e 100644 --- a/src/version.c +++ b/src/version.c @@ -756,6 +756,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 3120, +/**/ 3119, /**/ 3118, |