diff options
| author | Bram Moolenaar <Bram@vim.org> | 2020-08-31 21:30:32 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2020-08-31 21:30:32 +0200 |
| commit | 7d6979608ee83b06ccfab2589da3047b143defae (patch) | |
| tree | a0abc8a6e0379d8843562b8d71407d11be5f392e /src/testdir/test_python2.vim | |
| parent | 07e87e9eb5e7195d47d47c0ca752b6c8372a99ea (diff) | |
patch 8.2.1555: not all tests are executed on Github Actionsv8.2.1555
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)
Diffstat (limited to 'src/testdir/test_python2.vim')
| -rw-r--r-- | src/testdir/test_python2.vim | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/testdir/test_python2.vim b/src/testdir/test_python2.vim index 8fa73401bd..fd8fe70e49 100644 --- 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')) |