From 730b24833952f0f4a9a17b7815b0d9f87c609eb8 Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Sun, 9 Aug 2020 13:02:10 +0200 Subject: patch 8.2.1400: Vim9: test does not delete written files Problem: Vim9: test does not delete written files. Solution: Correct file names. --- src/testdir/test_vim9_script.vim | 14 +++++++------- src/version.c | 2 ++ 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/src/testdir/test_vim9_script.vim b/src/testdir/test_vim9_script.vim index 226d07e9a..6c04316bc 100644 --- a/src/testdir/test_vim9_script.vim +++ b/src/testdir/test_vim9_script.vim @@ -1395,7 +1395,7 @@ def Test_import_export_expr_map() nnoremap trigger g:Trigger() feedkeys('trigger', "xt") - delete('Xexport.vim') + delete('Xexport_that.vim') delete('Ximport.vim') nunmap trigger enddef @@ -1407,11 +1407,11 @@ def Test_import_in_filetype() vim9script export let That = 'yes' END - writefile(export_lines, 'ftplugin/Xexport_that.vim') + writefile(export_lines, 'ftplugin/Xexport_ft.vim') let import_lines =<< trim END vim9script - import That from './Xexport_that.vim' + import That from './Xexport_ft.vim' assert_equal('yes', That) g:did_load_mytpe = 1 END @@ -1425,7 +1425,7 @@ def Test_import_in_filetype() assert_equal(1, g:did_load_mytpe) quit! - delete('Xexport.vim') + delete('Xexport_ft.vim') delete('ftplugin', 'rf') &rtp = save_rtp enddef @@ -1484,13 +1484,13 @@ def Run_Test_import_fails_on_command_line() return 0 enddef END - writefile(export, 'Xexport.vim') + writefile(export, 'XexportCmd.vim') - let buf = RunVimInTerminal('-c "import Foo from ''./Xexport.vim''"', #{ + let buf = RunVimInTerminal('-c "import Foo from ''./XexportCmd.vim''"', #{ rows: 6, wait_for_ruler: 0}) WaitForAssert({-> assert_match('^E1094:', term_getline(buf, 5))}) - delete('Xexport.vim') + delete('XexportCmd.vim') StopVimInTerminal(buf) enddef diff --git a/src/version.c b/src/version.c index a85d54de0..20e8b36b8 100644 --- a/src/version.c +++ b/src/version.c @@ -754,6 +754,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 1400, /**/ 1399, /**/ -- cgit v1.2.1