Skip to content

Commit 730b248

Browse files
committed
patch 8.2.1400: Vim9: test does not delete written files
Problem: Vim9: test does not delete written files. Solution: Correct file names.
1 parent efa9444 commit 730b248

2 files changed

Lines changed: 9 additions & 7 deletions

File tree

src/testdir/test_vim9_script.vim

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1395,7 +1395,7 @@ def Test_import_export_expr_map()
13951395
nnoremap <expr> trigger g:Trigger()
13961396
feedkeys('trigger', "xt")
13971397

1398-
delete('Xexport.vim')
1398+
delete('Xexport_that.vim')
13991399
delete('Ximport.vim')
14001400
nunmap trigger
14011401
enddef
@@ -1407,11 +1407,11 @@ def Test_import_in_filetype()
14071407
vim9script
14081408
export let That = 'yes'
14091409
END
1410-
writefile(export_lines, 'ftplugin/Xexport_that.vim')
1410+
writefile(export_lines, 'ftplugin/Xexport_ft.vim')
14111411

14121412
let import_lines =<< trim END
14131413
vim9script
1414-
import That from './Xexport_that.vim'
1414+
import That from './Xexport_ft.vim'
14151415
assert_equal('yes', That)
14161416
g:did_load_mytpe = 1
14171417
END
@@ -1425,7 +1425,7 @@ def Test_import_in_filetype()
14251425
assert_equal(1, g:did_load_mytpe)
14261426

14271427
quit!
1428-
delete('Xexport.vim')
1428+
delete('Xexport_ft.vim')
14291429
delete('ftplugin', 'rf')
14301430
&rtp = save_rtp
14311431
enddef
@@ -1484,13 +1484,13 @@ def Run_Test_import_fails_on_command_line()
14841484
return 0
14851485
enddef
14861486
END
1487-
writefile(export, 'Xexport.vim')
1487+
writefile(export, 'XexportCmd.vim')
14881488

1489-
let buf = RunVimInTerminal('-c "import Foo from ''./Xexport.vim''"', #{
1489+
let buf = RunVimInTerminal('-c "import Foo from ''./XexportCmd.vim''"', #{
14901490
rows: 6, wait_for_ruler: 0})
14911491
WaitForAssert({-> assert_match('^E1094:', term_getline(buf, 5))})
14921492

1493-
delete('Xexport.vim')
1493+
delete('XexportCmd.vim')
14941494
StopVimInTerminal(buf)
14951495
enddef
14961496

src/version.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -754,6 +754,8 @@ static char *(features[]) =
754754

755755
static int included_patches[] =
756756
{ /* Add new patch number below this line */
757+
/**/
758+
1400,
757759
/**/
758760
1399,
759761
/**/

0 commit comments

Comments
 (0)