Skip to content

Commit

Permalink
patch 9.0.1812: CI still fails with sodium_mlock error()
Browse files Browse the repository at this point in the history
Problem:  CI still fails with sodium_mlock error()
Solution: Catch and ignore E1230 error in test_crypt

closes: #12939

Signed-off-by: Christian Brabandt <cb@256bit.org>
  • Loading branch information
chrisbra committed Aug 28, 2023
1 parent 85c3a5b commit 93ebb5e
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 1 deletion.
6 changes: 5 additions & 1 deletion src/testdir/test_crypt.vim
Original file line number Diff line number Diff line change
Expand Up @@ -290,7 +290,11 @@ func Test_uncrypt_xchacha20v2_2()
" encrypted using xchacha20
call assert_match("\[xchachav2\]", execute(':messages'))
bw!
call feedkeys(":verbose :sp Xcrypt_sodium_v2.txt\<CR>sodium\<CR>", 'xt')
try
call feedkeys(":verbose :sp Xcrypt_sodium_v2.txt\<CR>sodium\<CR>", 'xt')
catch /^Vim\%((\a\+)\)\=:E1230:/ " sodium_mlock() not possible, may happen at Github CI
throw 'Skipped: sodium_mlock() not possible'
endtry
" successfully decrypted
call assert_equal(range(1, 4000)->map( {_, v -> string(v)}), getline(1,'$'))
call assert_match('xchacha20v2: using default \w\+ "\d\+" for Key derivation.', execute(':messages'))
Expand Down
2 changes: 2 additions & 0 deletions src/version.c
Original file line number Diff line number Diff line change
Expand Up @@ -699,6 +699,8 @@ static char *(features[]) =

static int included_patches[] =
{ /* Add new patch number below this line */
/**/
1812,
/**/
1811,
/**/
Expand Down

0 comments on commit 93ebb5e

Please sign in to comment.