Skip to content

Commit dc88645

Browse files
authored
Unify 3.4 and 3.6 test suites (#2050)
* Unify 3.4 and 3.6 test suites * Cleanup * Fix test_ssl_stdlib * Handle failing test
1 parent 7697f70 commit dc88645

65 files changed

Lines changed: 1644 additions & 450 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

make.ps1

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -244,18 +244,6 @@ function Purge() {
244244
}
245245

246246
switch -wildcard ($target) {
247-
# debug targets
248-
"restore-debug" { Main "RestoreReferences" "Debug" }
249-
"debug" { Main "Build" "Debug" }
250-
"clean-debug" { Main "Clean" "Debug" }
251-
"stage-debug" { Main "Stage" "Debug" }
252-
"package-debug" { Main "Package" "Debug" }
253-
"test-debug-*" { Test $target.Substring(11) "Debug" $frameworks $platform; break }
254-
"test-debug" { Test "all" "Debug" $frameworks $platform; break }
255-
256-
# release targets
257-
"release" { Main "Build" "Release" }
258-
259247
# general targets
260248
"restore" { Main "RestoreReferences" $configuration }
261249
"build" { Main "Build" $configuration }
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,11 @@
2323

2424
#if FEATURE_PROCESS
2525

26+
#if PYTHON_34 // rename to _signal in 3.5
2627
[assembly: PythonModule("signal", typeof(IronPython.Modules.PythonSignal))]
28+
#else
29+
[assembly: PythonModule("_signal", typeof(IronPython.Modules.PythonSignal))]
30+
#endif
2731
namespace IronPython.Modules {
2832
public static partial class PythonSignal {
2933
public const string __doc__ = """

src/core/IronPython.StdLib/lib/unittest/loader.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ def loadTestsFromTestCase(self, testCaseClass):
8181
loaded_suite = self.suiteClass(map(testCaseClass, testCaseNames))
8282
return loaded_suite
8383

84-
def loadTestsFromModule(self, module, use_load_tests=True):
84+
def loadTestsFromModule(self, module, use_load_tests=True, **kws): # ironpython: add kws to accept pattern for load_tests
8585
"""Return a suite of all tests cases contained in the given module"""
8686
tests = []
8787
for name in dir(module):

0 commit comments

Comments
 (0)