Mercurial > vim

diff src/testdir/test_python2.vim @ 22011:2b6d696b063d v8.2.1555

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 8.2.1555: not all tests are executed on Github Actions Commit: https://github.com/vim/vim/commit/7d6979608ee83b06ccfab2589da3047b143defae Author: Bram Moolenaar <Bram@vim.org> Date: Mon Aug 31 21:30:32 2020 +0200 patch 8.2.1555: not all tests are executed on Github Actions Problem: Not all tests are executed on Github Actions. Solution: Copy "src" to "src2" earlier. Recognize "src2" in a couple more places. Add two tests to the list of flaky tests. (Ken Takata, closes #6798)
author Bram Moolenaar <Bram@vim.org>
date Mon, 31 Aug 2020 21:45:03 +0200
parents 6a4806e326dd
children 690b84a6a7ce
line wrap: on
line diff
--- a/src/testdir/test_python2.vim
+++ b/src/testdir/test_python2.vim
@@ -2412,7 +2412,7 @@ func Test_python_chdir()
     cb.append(vim.eval('@%'))
     os.chdir('..')
     path = fnamemodify('.', ':p:h:t')
-    if path != 'src':
+    if path != 'src' and path != 'src2':
       # Running tests from a shadow directory, so move up another level
       # This will result in @% looking like shadow/testdir/Xfile, hence the
       # extra fnamemodify
@@ -2422,7 +2422,8 @@ func Test_python_chdir()
       os.chdir(path)
       del path
     else:
-      cb.append(fnamemodify('.', ':p:h:t'))
+      # Also accept running from src2/testdir/ for MS-Windows CI.
+      cb.append(fnamemodify('.', ':p:h:t').replace('src2', 'src'))
       cb.append(vim.eval('@%').replace(os.path.sep, '/'))
     os.chdir('testdir')
     cb.append(fnamemodify('.', ':p:h:t'))