Mercurial > vim
comparison src/testdir/test_python3.vim @ 22011:2b6d696b063d v8.2.1555
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 | d1a7088c6efe |
children | 1928f863ac6e |
comparison
equal
deleted
inserted
replaced
22010:35e1f299493e | 22011:2b6d696b063d |
---|---|
2589 fnamemodify = vim.Function('fnamemodify') | 2589 fnamemodify = vim.Function('fnamemodify') |
2590 cb.append(str(fnamemodify('.', ':p:h:t'))) | 2590 cb.append(str(fnamemodify('.', ':p:h:t'))) |
2591 cb.append(vim.eval('@%')) | 2591 cb.append(vim.eval('@%')) |
2592 os.chdir('..') | 2592 os.chdir('..') |
2593 path = fnamemodify('.', ':p:h:t') | 2593 path = fnamemodify('.', ':p:h:t') |
2594 if path != b'src': | 2594 if path != b'src' and path != b'src2': |
2595 # Running tests from a shadow directory, so move up another level | 2595 # Running tests from a shadow directory, so move up another level |
2596 # This will result in @% looking like shadow/testdir/Xfile, hence the | 2596 # This will result in @% looking like shadow/testdir/Xfile, hence the |
2597 # slicing to remove the leading path and path separator | 2597 # slicing to remove the leading path and path separator |
2598 os.chdir('..') | 2598 os.chdir('..') |
2599 cb.append(str(fnamemodify('.', ':p:h:t'))) | 2599 cb.append(str(fnamemodify('.', ':p:h:t'))) |
2600 cb.append(vim.eval('@%')[len(path)+1:].replace(os.path.sep, '/')) | 2600 cb.append(vim.eval('@%')[len(path)+1:].replace(os.path.sep, '/')) |
2601 os.chdir(path) | 2601 os.chdir(path) |
2602 else: | 2602 else: |
2603 cb.append(str(fnamemodify('.', ':p:h:t'))) | 2603 # Also accept running from src2/testdir/ for MS-Windows CI. |
2604 cb.append(str(fnamemodify('.', ':p:h:t').replace(b'src2', b'src'))) | |
2604 cb.append(vim.eval('@%').replace(os.path.sep, '/')) | 2605 cb.append(vim.eval('@%').replace(os.path.sep, '/')) |
2605 del path | 2606 del path |
2606 os.chdir('testdir') | 2607 os.chdir('testdir') |
2607 cb.append(str(fnamemodify('.', ':p:h:t'))) | 2608 cb.append(str(fnamemodify('.', ':p:h:t'))) |
2608 cb.append(vim.eval('@%')) | 2609 cb.append(vim.eval('@%')) |