Skip to content

Commit 153895e

Browse files
slozierslozier
authored
Misc changes (#1924)
* Add comments about removed modules * Fix cmath.acos imaginary sign * Enable test_platform * Fix _MISSING_SSL_MESSAGE in test_venv * Disable test on macOS * Rethrow thread exception when executing tests * Try to follow symlinks
1 parent 3c7fce2 commit 153895e

File tree

8 files changed

+56
-44
lines changed

8 files changed

+56
-44
lines changed

‎src/core/IronPython.Modules/binascii.cs

+4
Original file line numberDiff line numberDiff line change
@@ -320,15 +320,19 @@ static void to_hex(char ch, StringBuilder s, int index) {
320320

321321
#region hqx
322322

323+
// TODO: removed in 3.11
323324
public static object a2b_hqx(object? data) {
324325
throw new NotImplementedException();
325326
}
327+
// TODO: removed in 3.11
326328
public static object rledecode_hqx(object? data) {
327329
throw new NotImplementedException();
328330
}
331+
// TODO: removed in 3.11
329332
public static object rlecode_hqx(object? data) {
330333
throw new NotImplementedException();
331334
}
335+
// TODO: removed in 3.11
332336
public static object b2a_hqx(object? data) {
333337
throw new NotImplementedException();
334338
}

‎src/core/IronPython.Modules/cmath.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ public static Complex acos([NotNone] object x) {
146146
double real = Math.Acos(0.5 * (a - b));
147147
double imag = Math.Log(c + Math.Sqrt(c + 1) * Math.Sqrt(c - 1));
148148

149-
return new Complex(real, num.Imaginary >= 0 ? imag : -imag);
149+
return new Complex(real, DoubleOps.IsNegative(num.Imaginary) ? imag : -imag);
150150
}
151151

152152
//asin(x) = -i*ln( i*x + (1-x*x)^1/2)

‎src/core/IronPython.StdLib/lib/test/test_platform.py

+7-6
Original file line numberDiff line numberDiff line change
@@ -59,14 +59,15 @@ def test_processor(self):
5959

6060
def setUp(self):
6161
self.save_version = sys.version
62-
self.save_mercurial = sys._mercurial
62+
self.save_git = sys._git
6363
self.save_platform = sys.platform
6464

6565
def tearDown(self):
6666
sys.version = self.save_version
67-
sys._mercurial = self.save_mercurial
67+
sys._git = self.save_git
6868
sys.platform = self.save_platform
6969

70+
@unittest.skipIf(sys.implementation.name == "ironpython", "not compatible with IronPython platform changes")
7071
def test_sys_version(self):
7172
# Old test.
7273
for input, output in (
@@ -78,7 +79,7 @@ def test_sys_version(self):
7879
('IronPython', '1.0.0', '', '', '', '', '.NET 2.0.50727.42')),
7980
):
8081
# branch and revision are not "parsed", but fetched
81-
# from sys._mercurial. Ignore them
82+
# from sys._git. Ignore them
8283
(name, version, branch, revision, buildno, builddate, compiler) \
8384
= platform._sys_version(input)
8485
self.assertEqual(
@@ -125,10 +126,10 @@ def test_sys_version(self):
125126
sys_versions.items():
126127
sys.version = version_tag
127128
if subversion is None:
128-
if hasattr(sys, "_mercurial"):
129-
del sys._mercurial
129+
if hasattr(sys, "_git"):
130+
del sys._git
130131
else:
131-
sys._mercurial = subversion
132+
sys._git = subversion
132133
if sys_platform is not None:
133134
sys.platform = sys_platform
134135
self.assertEqual(platform.python_implementation(), info[0])

‎src/core/IronPython.StdLib/lib/test/test_venv.py

+3-11
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,6 @@
1818
import unittest
1919
import venv
2020

21-
# pip currently requires ssl support, so we ensure we handle
22-
# it being missing (http://bugs.python.org/issue19744)
23-
try:
24-
import ssl
25-
except ImportError:
26-
ssl = None
27-
2821
skipInVenv = unittest.skipIf(sys.prefix != sys.base_prefix,
2922
'Test not appropriate in a venv')
3023

@@ -307,18 +300,17 @@ def test_explicit_no_pip(self):
307300
self.run_with_capture(venv.create, self.env_dir, with_pip=False)
308301
self.assert_pip_not_installed()
309302

310-
@failsOnWindows
311-
def test_devnull_exists_and_is_empty(self):
303+
def test_devnull(self):
312304
# Fix for issue #20053 uses os.devnull to force a config file to
313305
# appear empty. However http://bugs.python.org/issue20541 means
314306
# that doesn't currently work properly on Windows. Once that is
315307
# fixed, the "win_location" part of test_with_pip should be restored
316-
self.assertTrue(os.path.exists(os.devnull))
317308
with open(os.devnull, "rb") as f:
318309
self.assertEqual(f.read(), b"")
319310

311+
self.assertTrue(os.path.exists(os.devnull))
312+
320313
# Requesting pip fails without SSL (http://bugs.python.org/issue19744)
321-
@unittest.skipIf(ssl is None, ensurepip._MISSING_SSL_MESSAGE)
322314
def test_with_pip(self):
323315
rmtree(self.env_dir)
324316
with EnvironmentVarGuard() as envvars:

‎src/core/IronPython/Runtime/Operations/FloatOps.cs

+10
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
using System.Diagnostics;
77
using System.Globalization;
88
using System.Numerics;
9+
using System.Runtime.CompilerServices;
910
using System.Text;
1011
using System.Text.RegularExpressions;
1112

@@ -638,6 +639,15 @@ internal static bool IsNegativeZero(double value) {
638639
return (value == 0.0) && double.IsNegativeInfinity(1.0 / value);
639640
}
640641

642+
[MethodImpl(MethodImplOptions.AggressiveInlining)]
643+
internal static bool IsNegative(double value) {
644+
#if NET7_0_OR_GREATER
645+
return double.IsNegative(value);
646+
#else
647+
return value < 0.0 || IsNegativeZero(value);
648+
#endif
649+
}
650+
641651
internal static int Sign(double value) {
642652
if (value == 0.0) {
643653
return double.IsPositiveInfinity(1.0 / value) ? 1 : -1;

‎src/executables/IronPython.Console/ipy-mono.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
#!/bin/sh
2-
BASEDIR=$(dirname "$0")
2+
BASEDIR=$(dirname $(readlink -f "$0"))
33
ABS_PATH=$(cd "$BASEDIR"; pwd)
4-
mono "$ABS_PATH/ipy.exe" "$@"
4+
mono "$ABS_PATH/ipy.exe" "$@"

‎tests/IronPython.Tests/Cases/CPythonCasesManifest.ini

+19-20
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ Ignore=true
105105
RunCondition=$(IS_OSX)
106106
Ignore=true
107107

108-
[CPython.test_aifc] # Module will be removed in 3.13 - https://github.com/IronLanguages/ironpython3/issues/1352
108+
[CPython.test_aifc] # Module has been removed in 3.13 - https://github.com/IronLanguages/ironpython3/issues/1352
109109
Ignore=true
110110
Reason=ImportError: No module named audioop
111111

@@ -115,7 +115,7 @@ IsolationLevel=PROCESS # https://github.com/IronLanguages/ironpython3/issues/489
115115
[CPython.test_ast]
116116
Ignore=true
117117

118-
[CPython.test_asynchat] # Module will be removed in 3.12 - https://github.com/IronLanguages/ironpython3/issues/1352
118+
[CPython.test_asynchat] # Module has been removed in 3.12 - https://github.com/IronLanguages/ironpython3/issues/1352
119119
RunCondition=NOT $(IS_OSX) # TODO: debug
120120

121121
[CPython.test_asyncio.test_base_events]
@@ -151,20 +151,20 @@ Ignore=true
151151
[CPython.test_asyncio.test_windows_utils]
152152
Ignore=true
153153

154-
[CPython.test_asyncore] # Module will be removed in 3.12 - https://github.com/IronLanguages/ironpython3/issues/1352
154+
[CPython.test_asyncore] # Module has been removed in 3.12 - https://github.com/IronLanguages/ironpython3/issues/1352
155155
Ignore=true
156156

157157
[CPython.test_atexit]
158158
Ignore=true
159159

160-
[CPython.test_audioop] # Module will be removed in 3.13 - https://github.com/IronLanguages/ironpython3/issues/1352
160+
[CPython.test_audioop] # Module has been removed in 3.13 - https://github.com/IronLanguages/ironpython3/issues/1352
161161
Ignore=true
162162
Reason=ImportError: No module named audioop
163163

164164
[CPython.test_bigmem]
165165
Ignore=true
166166

167-
[CPython.test_binhex]
167+
[CPython.test_binhex] # Module has been removed in 3.11
168168
Ignore=true # blocked by https://github.com/IronLanguages/ironpython3/issues/673
169169

170170
[CPython.test_builtin] # IronPython.test_builtin_stdlib
@@ -188,11 +188,11 @@ Timeout=600000 # 10 minute timeout
188188
Ignore=true
189189
Reason=ImportError: No module named _testcapi
190190

191-
[CPython.test_cgi] # Module will be removed in 3.13 - https://github.com/IronLanguages/ironpython3/issues/1352
191+
[CPython.test_cgi] # Module has been removed in 3.13 - https://github.com/IronLanguages/ironpython3/issues/1352
192192
RunCondition=NOT $(IS_MONO)
193193
Reason=SystemError: The stream does not support seeking
194194

195-
[CPython.test_cgitb] # Module will be removed in 3.13 - https://github.com/IronLanguages/ironpython3/issues/1352
195+
[CPython.test_cgitb] # Module has been removed in 3.13 - https://github.com/IronLanguages/ironpython3/issues/1352
196196
Ignore=true
197197

198198
[CPython.test_class] # IronPython.test_class_stdlib
@@ -293,7 +293,7 @@ Ignore=true
293293
Ignore=true
294294
Reason=ImportError: No module named _lsprof
295295

296-
[CPython.test_crypt] # Module will be removed in 3.13 - https://github.com/IronLanguages/ironpython3/issues/1352
296+
[CPython.test_crypt] # Module has been removed in 3.13 - https://github.com/IronLanguages/ironpython3/issues/1352
297297
Ignore=true
298298
Reason=ImportError: No module named _crypt
299299

@@ -478,7 +478,7 @@ Reason=Blocking
478478

479479
[CPython.test_httpservers]
480480
Ignore=true
481-
Reason=Blocking
481+
Reason=Blocking # works?
482482

483483
[CPython.test_idle]
484484
Ignore=true
@@ -592,7 +592,7 @@ Ignore=true
592592
[CPython.test_modulefinder]
593593
Ignore=true
594594

595-
[CPython.test_msilib] # Module will be removed in 3.13 - https://github.com/IronLanguages/ironpython3/issues/1352
595+
[CPython.test_msilib] # Module has been removed in 3.13 - https://github.com/IronLanguages/ironpython3/issues/1352
596596
Ignore=true
597597
Reason=ImportError: No module named _msi
598598

@@ -616,12 +616,12 @@ Reason=ImportError: No module named _multiprocessing
616616
Ignore=true
617617
Reason=ImportError: No module named _multiprocessing
618618

619-
[CPython.test_nis] # Module will be removed in 3.13 - https://github.com/IronLanguages/ironpython3/issues/1352
619+
[CPython.test_nis] # Module has been removed in 3.13 - https://github.com/IronLanguages/ironpython3/issues/1352
620620
RunCondition=$(IS_POSIX)
621621
Ignore=true
622622
Reason=unittest.case.SkipTest: No module named 'nis'
623623

624-
[CPython.test_nntplib] # Module will be removed in 3.13 - https://github.com/IronLanguages/ironpython3/issues/1352
624+
[CPython.test_nntplib] # Module has been removed in 3.13 - https://github.com/IronLanguages/ironpython3/issues/1352
625625
Ignore=true # currently failing during CI
626626
RunCondition=NOT $(IS_NETCOREAPP) # https://github.com/IronLanguages/ironpython3/issues/1058
627627

@@ -641,7 +641,7 @@ Reason=unittest.case.SkipTest: os.openpty() not available.
641641
Ignore=true
642642
Reason=AttributeError: 'module' object has no attribute 'isatty'
643643

644-
[CPython.test_ossaudiodev] # Module will be removed in 3.13 - https://github.com/IronLanguages/ironpython3/issues/1352
644+
[CPython.test_ossaudiodev] # Module has been removed in 3.13 - https://github.com/IronLanguages/ironpython3/issues/1352
645645
Ignore=true
646646
Reason=unittest.case.SkipTest: No module named 'ossaudiodev'
647647

@@ -682,7 +682,7 @@ Reason=StackOverflowException
682682
Ignore=true
683683
Reason=StackOverflowException
684684

685-
[CPython.test_pipes] # Module will be removed in 3.13 - https://github.com/IronLanguages/ironpython3/issues/1352
685+
[CPython.test_pipes] # Module has been removed in 3.13 - https://github.com/IronLanguages/ironpython3/issues/1352
686686
RunCondition=$(IS_POSIX)
687687
Ignore=true
688688
Reason=unittest.case.SkipTest: pipes module only works on posix
@@ -694,8 +694,7 @@ Ignore=true
694694
Ignore=true
695695

696696
[CPython.test_platform]
697-
Ignore=true
698-
Reason=AttributeError: 'module' object has no attribute '_mercurial'
697+
RunCondition=NOT $(IS_OSX)
699698

700699
[CPython.test_poll]
701700
RunCondition=$(IS_POSIX)
@@ -802,7 +801,7 @@ Ignore=true
802801
[CPython.test_site]
803802
Ignore=true
804803

805-
[CPython.test_smtpd] # Module will be removed in 3.12 - https://github.com/IronLanguages/ironpython3/issues/1352
804+
[CPython.test_smtpd] # Module has been removed in 3.12 - https://github.com/IronLanguages/ironpython3/issues/1352
806805
Ignore=true
807806

808807
[CPython.test_smtplib]
@@ -817,7 +816,7 @@ Ignore=true # blocked by https://github.com/IronLanguages/ironpython3/issues/122
817816
[CPython.test_source_encoding]
818817
IsolationLevel=ENGINE # source file in a non-UTF-8 encoding
819818

820-
[CPython.test_spwd] # Module will be removed in 3.13 - https://github.com/IronLanguages/ironpython3/issues/1352
819+
[CPython.test_spwd] # Module has been removed in 3.13 - https://github.com/IronLanguages/ironpython3/issues/1352
821820
RunCondition=$(IS_POSIX)
822821

823822
[CPython.test_sqlite]
@@ -858,7 +857,7 @@ IsolationLevel=PROCESS
858857
Redirect=true
859858
Ignore=true
860859

861-
[CPython.test_sunau] # Module will be removed in 3.13 - https://github.com/IronLanguages/ironpython3/issues/1352
860+
[CPython.test_sunau] # Module has been removed in 3.13 - https://github.com/IronLanguages/ironpython3/issues/1352
862861
Ignore=true
863862
Reason=ImportError: No module named audioop
864863

@@ -908,7 +907,7 @@ Ignore=true
908907
Ignore=true
909908
Reason=ImportError: No module named '_tkinter'
910909

911-
[CPython.test_telnetlib] # Module will be removed in 3.13 - https://github.com/IronLanguages/ironpython3/issues/1352
910+
[CPython.test_telnetlib] # Module has been removed in 3.13 - https://github.com/IronLanguages/ironpython3/issues/1352
912911
RunCondition=NOT $(IS_LINUX) # TODO: debug
913912

914913
[CPython.test_tempfile]

‎tests/IronPython.Tests/Cases/CaseExecuter.cs

+10-4
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
using System.Reflection;
1111
using System.Runtime.CompilerServices;
1212
using System.Runtime.InteropServices;
13+
using System.Runtime.ExceptionServices;
1314
using System.Text.RegularExpressions;
1415
using System.Threading;
1516

@@ -290,7 +291,9 @@ private int GetResult(TestInfo testcase, ScriptEngine engine, ScriptSource sourc
290291
engine.GetSysModule().SetVariable("argv", PythonList.FromArrayNoCopy(new object[] { source.Path }));
291292
var compiledCode = source.Compile(new IronPython.Compiler.PythonCompilerOptions() { ModuleName = "__main__" });
292293

293-
int res = 0;
294+
ExceptionDispatchInfo exceptionInfo = null;
295+
296+
int res = -1;
294297
int maxStackSize = 2 * 1024 * 1024; // 2 MiB
295298
var thread = new Thread(() => {
296299
try {
@@ -301,12 +304,12 @@ private int GetResult(TestInfo testcase, ScriptEngine engine, ScriptSource sourc
301304
#pragma warning disable SYSLIB0006 // 'Thread.ResetAbort is not supported and throws PlatformNotSupportedException.'
302305
Thread.ResetAbort();
303306
#pragma warning restore SYSLIB0006
304-
} catch (Exception ex) when (ex.GetPythonException() is object pex) {
305-
if (DynamicHelpers.GetPythonType(pex).Name == "SkipTest") {
307+
} catch (Exception ex) {
308+
if (ex.GetPythonException() is object pex && DynamicHelpers.GetPythonType(pex).Name == "SkipTest") {
306309
NUnit.Framework.TestContext.Progress.WriteLine($"Test {testcase.Name} skipped: {pex}");
307310
res = 0;
308311
} else {
309-
throw;
312+
exceptionInfo = ExceptionDispatchInfo.Capture(ex);
310313
}
311314
}
312315
}, maxStackSize) {
@@ -324,6 +327,9 @@ private int GetResult(TestInfo testcase, ScriptEngine engine, ScriptSource sourc
324327
NUnit.Framework.TestContext.Error.WriteLine($"{testcase.Name} timed out after {testcase.Options.Timeout / 1000.0} seconds.");
325328
return -1;
326329
}
330+
331+
exceptionInfo?.Throw();
332+
327333
return res;
328334
} finally {
329335
Environment.CurrentDirectory = cwd;

0 commit comments

Comments
 (0)