comparison src/testdir/test_functions.vim @ 30051:13b02c1ea0f7 v9.0.0363

patch 9.0.0363: common names in test files causes tests to be flaky Commit: https://github.com/vim/vim/commit/b18b49699776485150b71626069a40d12d2c5590 Author: Bram Moolenaar <Bram@vim.org> Date: Fri Sep 2 21:55:50 2022 +0100 patch 9.0.0363: common names in test files causes tests to be flaky Problem: Common names in test files causes tests to be flaky. Solution: Use more specific names.
author Bram Moolenaar <Bram@vim.org>
date Fri, 02 Sep 2022 23:00:04 +0200
parents fd855ad74887
children b6b803ed4a53
comparison
equal deleted inserted replaced
30050:4d0a9c80a90c 30051:13b02c1ea0f7
373 func Test_resolve_win32() 373 func Test_resolve_win32()
374 CheckMSWindows 374 CheckMSWindows
375 375
376 " test for shortcut file 376 " test for shortcut file
377 if executable('cscript') 377 if executable('cscript')
378 new Xfile 378 new Xresfile
379 wq 379 wq
380 let lines =<< trim END 380 let lines =<< trim END
381 Set fs = CreateObject("Scripting.FileSystemObject") 381 Set fs = CreateObject("Scripting.FileSystemObject")
382 Set ws = WScript.CreateObject("WScript.Shell") 382 Set ws = WScript.CreateObject("WScript.Shell")
383 Set shortcut = ws.CreateShortcut("Xlink.lnk") 383 Set shortcut = ws.CreateShortcut("Xlink.lnk")
384 shortcut.TargetPath = fs.BuildPath(ws.CurrentDirectory, "Xfile") 384 shortcut.TargetPath = fs.BuildPath(ws.CurrentDirectory, "Xresfile")
385 shortcut.Save 385 shortcut.Save
386 END 386 END
387 call writefile(lines, 'link.vbs') 387 call writefile(lines, 'link.vbs')
388 silent !cscript link.vbs 388 silent !cscript link.vbs
389 call delete('link.vbs') 389 call delete('link.vbs')
390 call assert_equal(s:normalize_fname(getcwd() . '\Xfile'), s:normalize_fname(resolve('./Xlink.lnk'))) 390 call assert_equal(s:normalize_fname(getcwd() . '\Xresfile'), s:normalize_fname(resolve('./Xlink.lnk')))
391 call delete('Xfile') 391 call delete('Xresfile')
392 392
393 call assert_equal(s:normalize_fname(getcwd() . '\Xfile'), s:normalize_fname(resolve('./Xlink.lnk'))) 393 call assert_equal(s:normalize_fname(getcwd() . '\Xresfile'), s:normalize_fname(resolve('./Xlink.lnk')))
394 call delete('Xlink.lnk') 394 call delete('Xlink.lnk')
395 else 395 else
396 echomsg 'skipped test for shortcut file' 396 echomsg 'skipped test for shortcut file'
397 endif 397 endif
398 398
399 " remove files 399 " remove files
400 call delete('Xlink') 400 call delete('Xlink')
401 call delete('Xdir', 'd') 401 call delete('Xdir', 'd')
402 call delete('Xfile') 402 call delete('Xresfile')
403 403
404 " test for symbolic link to a file 404 " test for symbolic link to a file
405 new Xfile 405 new Xresfile
406 wq 406 wq
407 call assert_equal('Xfile', resolve('Xfile')) 407 call assert_equal('Xresfile', resolve('Xresfile'))
408 silent !mklink Xlink Xfile 408 silent !mklink Xlink Xresfile
409 if !v:shell_error 409 if !v:shell_error
410 call assert_equal(s:normalize_fname(getcwd() . '\Xfile'), s:normalize_fname(resolve('./Xlink'))) 410 call assert_equal(s:normalize_fname(getcwd() . '\Xresfile'), s:normalize_fname(resolve('./Xlink')))
411 call delete('Xlink') 411 call delete('Xlink')
412 else 412 else
413 echomsg 'skipped test for symbolic link to a file' 413 echomsg 'skipped test for symbolic link to a file'
414 endif 414 endif
415 call delete('Xfile') 415 call delete('Xresfile')
416 416
417 " test for junction to a directory 417 " test for junction to a directory
418 call mkdir('Xdir') 418 call mkdir('Xdir')
419 silent !mklink /J Xlink Xdir 419 silent !mklink /J Xlink Xdir
420 if !v:shell_error 420 if !v:shell_error
445 echomsg 'skipped test for symbolic link to a directory' 445 echomsg 'skipped test for symbolic link to a directory'
446 call delete('Xdir', 'd') 446 call delete('Xdir', 'd')
447 endif 447 endif
448 448
449 " test for buffer name 449 " test for buffer name
450 new Xfile 450 new Xbuffile
451 wq 451 wq
452 silent !mklink Xlink Xfile 452 silent !mklink Xlink Xbuffile
453 if !v:shell_error 453 if !v:shell_error
454 edit Xlink 454 edit Xlink
455 call assert_equal('Xlink', bufname('%')) 455 call assert_equal('Xlink', bufname('%'))
456 call delete('Xlink') 456 call delete('Xlink')
457 bw! 457 bw!
458 else 458 else
459 echomsg 'skipped test for buffer name' 459 echomsg 'skipped test for buffer name'
460 endif 460 endif
461 call delete('Xfile') 461 call delete('Xbuffile')
462 462
463 " test for reparse point 463 " test for reparse point
464 call mkdir('Xdir') 464 call mkdir('Xdir')
465 call assert_equal('Xdir', resolve('Xdir')) 465 call assert_equal('Xdir', resolve('Xdir'))
466 silent !mklink /D Xdirlink Xdir 466 silent !mklink /D Xdirlink Xdir