Skip to content

Commit 494b966

Browse files
naveen521kklazka
authored andcommitted
CI: clean up ignored tests
Remove tests which are passing now, or no longer exist, and move tests which only fail with msvcrt into a separate file.
1 parent ce67dc2 commit 494b966

File tree

4 files changed

+22
-24
lines changed

4 files changed

+22
-24
lines changed

.github/workflows/mingw.yml

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,16 +89,24 @@ jobs:
8989
shell: msys2 {0}
9090
run: |
9191
IGNOREFILE="$(pwd)/mingw_ignorefile.txt"
92+
IGNOREFILE_EXTRA="$IGNOREFILE"
93+
if [[ "${{ matrix.msystem }}" == "MINGW32" ]] || [[ "${{ matrix.msystem }}" == "MINGW64" ]]; then
94+
IGNOREFILE_EXTRA="$(pwd)/mingw_ignorefile_msvcrt.txt"
95+
fi
9296
cd _build
93-
MSYSTEM= ./python.exe -m test -j8 --ignorefile "$IGNOREFILE" -W
97+
MSYSTEM= ./python.exe -m test -j8 --ignorefile "$IGNOREFILE" --ignorefile "$IGNOREFILE_EXTRA" -W
9498
9599
- name: Run broken tests
96100
continue-on-error: true
97101
shell: msys2 {0}
98102
run: |
99103
IGNOREFILE="$(pwd)/mingw_ignorefile.txt"
104+
IGNOREFILE_EXTRA="$IGNOREFILE"
105+
if [[ "${{ matrix.msystem }}" == "MINGW32" ]] || [[ "${{ matrix.msystem }}" == "MINGW64" ]]; then
106+
IGNOREFILE_EXTRA="$(pwd)/mingw_ignorefile_msvcrt.txt"
107+
fi
100108
cd _build
101-
MSYSTEM= ./python.exe -m test -j8 --matchfile "$IGNOREFILE" -W
109+
MSYSTEM= ./python.exe -m test -j8 --matchfile "$IGNOREFILE" --matchfile "$IGNOREFILE_EXTRA" -W
102110
103111
- name: Install
104112
shell: msys2 {0}

Lib/test/test_wmi.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99

1010
# Do this first so test will be skipped if module doesn't exist
11-
_wmi = import_helper.import_module('_wmi', required_on=['win'])
11+
_wmi = import_helper.import_module('_wmi')
1212

1313

1414
def wmi_exec_query(query):

mingw_ignorefile.txt

Lines changed: 3 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,11 @@ test.test_ctypes.test_loading.LoaderTest.test_load_dll_with_flags
22
distutils.tests.test_bdist_dumb.BuildDumbTestCase.test_simple_built
33
distutils.tests.test_cygwinccompiler.CygwinCCompilerTestCase.test_get_versions
44
distutils.tests.test_util.UtilTestCase.test_change_root
5-
test.datetimetester.TestLocalTimeDisambiguation_Fast.*
6-
test.datetimetester.TestLocalTimeDisambiguation_Pure.*
7-
test.test_cmath.CMathTests.test_specific_values
8-
test.test_cmd_line_script.CmdLineTest.test_consistent_sys_path_for_direct_execution
95
test.test_compileall.CommandLineTestsNoSourceEpoch.*
106
test.test_compileall.CommandLineTestsWithSourceEpoch.*
117
test.test_compileall.CompileallTestsWithoutSourceEpoch.*
128
test.test_compileall.CompileallTestsWithSourceEpoch.*
139
test.test_import.ImportTests.test_dll_dependency_import
14-
test.test_math.MathTests.*
1510
test.test_ntpath.NtCommonTest.test_import
1611
test.test_os.StatAttributeTests.test_stat_block_device
1712
test.test_os.TestScandir.test_attributes
@@ -23,21 +18,8 @@ test.test_site._pthFileTests.*
2318
test.test_site.HelperFunctionsTests.*
2419
test.test_site.StartupImportTests.*
2520
test.test_ssl.*
26-
test.test_strptime.CalculationTests.*
27-
test.test_strptime.StrptimeTests.test_weekday
28-
test.test_strptime.TimeRETests.test_compile
29-
test.test_tools.test_i18n.Test_pygettext.test_POT_Creation_Date
3021
test.test_venv.BasicTest.*
3122
test.test_venv.EnsurePipTest.*
32-
test.test_sysconfig.TestSysConfig.test_user_similar
33-
test.test_tcl.TclTest.testLoadWithUNC
34-
test.test_wmi
35-
# flaky
36-
test.test__xxsubinterpreters.*
37-
test.test_asyncio.test_subprocess.SubprocessProactorTests.test_stdin_broken_pipe
38-
test.test_asynchat.TestAsynchat.test_line_terminator2
39-
test.test_asyncgen.AsyncGenAsyncioTest.test_async_gen_asyncio_gc_aclose_09
40-
test.test_concurrent_futures.ThreadPoolShutdownTest.test_interpreter_shutdown
41-
test.test_asynchat.TestNotConnected.test_disallow_negative_terminator
42-
test.test_logging.SysLogHandlerTest.*
43-
test.test_logging.IPv6SysLogHandlerTest.*
23+
24+
test.test_dict.DictTest.test_splittable_to_generic_combinedtable
25+
test.test_capi.test_run.CAPITest.test_run_fileexflags

mingw_ignorefile_msvcrt.txt

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
test.datetimetester.TestLocalTimeDisambiguation_Fast.*
2+
test.datetimetester.TestLocalTimeDisambiguation_Pure.*
3+
test.test_cmath.CMathTests.test_specific_values
4+
test.test_math.MathTests.*
5+
test.test_strptime.CalculationTests.*
6+
test.test_strptime.StrptimeTests.test_weekday
7+
test.test_strptime.TimeRETests.test_compile
8+
test.test_tools.test_i18n.Test_pygettext.test_POT_Creation_Date

0 commit comments

Comments
 (0)