Skip to content

Reorganize stdlib test overrides #2068

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
slozier merged 3 commits into from
Jun 20, 2026
Merged

Reorganize stdlib test overrides #2068

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f36cac3
Reorganize stdlib test overrides
slozier Jun 19, 2026
01316f0
Rename test_sqlite3.py to test_sqlite.py
slozier Jun 20, 2026
165dc44
Fix test_tokenize
slozier Jun 20, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/core/IronPython.StdLib
Open in desktop
Submodule IronPython.StdLib updated 5 files
+0 −0 lib/test/test_exception_hierarchy.py
+1 −1 lib/test/test_tokenize.py
+0 −0 lib/test/test_unicode_file_functions.py
+0 −0 lib/test/test_unicode_identifiers.py
+0 −0 lib/test/test_yield_from.py
31 changes: 19 additions & 12 deletions tests/IronPython.Tests/Cases/CPythonCases.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,19 +19,26 @@ public override int Test(TestInfo testcase) {
internal class CPythonCaseGenerator : CommonCaseGenerator<CPythonCases> {
protected override IEnumerable<TestInfo> GetTests() {
var libFolder = Path.Combine("src", "core", "IronPython.StdLib", "lib");
return GetFilenames(new [] {
System.Tuple.Create(category, Path.Combine(libFolder, "test")),
System.Tuple.Create($"{category}.ctypes", Path.Combine(libFolder, "ctypes", "test")),
System.Tuple.Create($"{category}.distutils", Path.Combine(libFolder, "distutils", "tests")),
System.Tuple.Create($"{category}.unittest", Path.Combine(libFolder, "unittest", "test")),
})
.OrderBy(testcase => testcase.Name);
var suiteFolder = Path.Combine("tests", "suite", "stdlib");

IEnumerable<TestInfo> GetFilenames(IEnumerable<System.Tuple<string, string>> folders) {
foreach (var tuple in folders) {
var fullPath = Path.Combine(CaseExecuter.FindRoot(), tuple.Item2);
foreach (var filename in Directory.EnumerateFiles(fullPath, "test_*.py", SearchOption.AllDirectories))
yield return new TestInfo(Path.GetFullPath(filename), tuple.Item1, tuple.Item2, manifest);
return GetTestInfo(category, "test")
.Concat(GetTestInfo($"{category}.ctypes", Path.Combine("ctypes", "test")))
.Concat(GetTestInfo($"{category}.distutils", Path.Combine("distutils", "tests")))
.Concat(GetTestInfo($"{category}.unittest", Path.Combine("unittest", "test")))
.OrderBy(testcase => testcase.Name);

IEnumerable<TestInfo> GetTestInfo(string category, string folder) {
var root = CaseExecuter.FindRoot();
var altFolder = Path.GetDirectoryName(folder); // drop the trailing test (or tests) folder
var fullPath = Path.GetFullPath(Path.Combine(root, libFolder, folder));
var altFullPath = Path.GetFullPath(Path.Combine(root, suiteFolder, altFolder));
foreach (var filename in Directory.EnumerateFiles(fullPath, "test_*.py", SearchOption.AllDirectories)) {
var altFilename = Path.GetFullPath(Path.Combine(altFullPath, Path.GetRelativePath(fullPath, filename)));
if (File.Exists(altFilename)) {
yield return new TestInfo(altFilename, category, Path.Combine(suiteFolder, altFolder), manifest);
} else {
yield return new TestInfo(filename, category, Path.Combine(libFolder, folder), manifest);
}
}
}
}
Expand Down
Loading
Loading