Skip to content

Commit 73c6d61

Browse files
slozierslozier
authored
Re-enable some tests (#1497)
* Re-enable test_csv * Re-enable test_smtpnet * Re-enable test_userdict * Re-enable test_imp * Get test passing on Linux * Re-enable test_types_stdlib * Re-enable test_ssl_stdlib * Fix test failure on .NET 6
1 parent 07f1ff6 commit 73c6d61

9 files changed

Lines changed: 83 additions & 84 deletions

File tree

‎Src/IronPython.Modules/_csv.cs‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -256,6 +256,7 @@ public class Dialect {
256256
private Dialect() {
257257
}
258258

259+
[PythonHidden]
259260
public static Dialect Create(CodeContext/*!*/ context,
260261
[ParamDictionary] IDictionary<object, object> kwArgs,
261262
params object[] args) {
@@ -408,6 +409,7 @@ private static string SetString(string name, object src, bool found, string @def
408409
}
409410
return result;
410411
}
412+
411413
#endregion
412414

413415
public Dialect(CodeContext/*!*/ context,
@@ -501,6 +503,13 @@ public Dialect(CodeContext/*!*/ context,
501503
throw PythonOps.TypeError("lineterminator must be set");
502504
}
503505

506+
// CPython defines these overloads on Dialect since 3.10
507+
[Documentation("raises an exception to avoid pickling")]
508+
public object __reduce__(params object[] args) => throw PythonOps.TypeError("cannot pickle 'Dialect' instances");
509+
510+
[Documentation("raises an exception to avoid pickling")]
511+
public object __reduce_ex__(params object[] args) => throw PythonOps.TypeError("cannot pickle 'Dialect' instances");
512+
504513
public string escapechar {
505514
get { return _escapechar; }
506515
}

‎Src/IronPython.Modules/_ssl.cs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -200,11 +200,7 @@ public void set_ecdh_curve(CodeContext context, [NotNone] Bytes curve) {
200200
public void load_cert_chain(CodeContext context, string certfile, string keyfile = null, object password = null) {
201201
if (keyfile is not null) throw new NotImplementedException(nameof(keyfile));
202202
if (password is not null) throw new NotImplementedException(nameof(password));
203-
#if NET
204-
_cert = X509Certificate2.CreateFromPemFile(certfile, keyfile);
205-
#else
206203
_cert = ReadCertificate(context, certfile, readKey: true);
207-
#endif
208204
}
209205

210206
public PythonList get_ca_certs(CodeContext context, bool binary_form = false) {
@@ -963,7 +959,11 @@ private static PythonTuple IssuerFieldToPython(CodeContext context, string p) {
963959
private static X509Certificate2 ReadCertificate(CodeContext context, string filename, bool readKey = false) {
964960
#if NET
965961
if (readKey) {
966-
return X509Certificate2.CreateFromPemFile(filename);
962+
try {
963+
return X509Certificate2.CreateFromPemFile(filename);
964+
} catch (Exception e) {
965+
throw ErrorDecoding(context, filename, e);
966+
}
967967
}
968968
#endif
969969

‎Src/IronPython/Runtime/Operations/IntOps.cs‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -317,6 +317,10 @@ public static string __format__(CodeContext/*!*/ context, int self, [NotNone] st
317317
throw PythonOps.ValueError("Sign not allowed with integer format specifier 'c'");
318318
}
319319

320+
if (spec.AlternateForm) {
321+
throw PythonOps.ValueError("Alternate form(#) not allowed with integer format specifier 'c'");
322+
}
323+
320324
if (self < 0 || self > 0x10ffff) {
321325
throw PythonOps.OverflowError("%c arg not in range(0x110000)");
322326
}

‎Src/IronPythonTest/Cases/CPythonCasesManifest.ini‎

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1079,6 +1079,10 @@ Reason=TypeError: transient_internet() takes exactly 1 arguments (2 given)
10791079
RunCondition=NOT $(IS_POSIX)
10801080
Reason=https://github.com/IronLanguages/ironpython3/issues/581
10811081

1082+
[CPython.test_userdict]
1083+
IsolationLevel=ENGINE
1084+
MaxRecursion=100
1085+
10821086
[CPython.test_userlist]
10831087
IsolationLevel=ENGINE
10841088
MaxRecursion=100
@@ -1192,9 +1196,6 @@ Ignore=true # test_context_tb
11921196
[CPython.test_collections]
11931197
Ignore=true # blocked by https://github.com/IronLanguages/ironpython3/issues/98
11941198

1195-
[CPython.test_csv]
1196-
Ignore=true # two failures
1197-
11981199
[CPython.test_fileinput]
11991200
Ignore=true # test_errors - https://github.com/IronLanguages/ironpython3/issues/1452
12001201

@@ -1234,9 +1235,6 @@ Ignore=true # lots of failures
12341235
[CPython.test_set]
12351236
Ignore=true # test_hash_effectiveness
12361237

1237-
[CPython.test_smtpnet]
1238-
Ignore=true # unittest.case.SkipTest: Cannot import name SSLSession
1239-
12401238
[CPython.test_spwd]
12411239
Ignore=true # fails on macOS
12421240

@@ -1246,9 +1244,6 @@ Ignore=true # AssertionError: DeprecationWarning not triggered
12461244
[CPython.test_support]
12471245
Ignore=true # lots of failures
12481246

1249-
[CPython.test_userdict]
1250-
Ignore=true # StackOverflowException
1251-
12521247
[CPython.test_userlist]
12531248
Ignore=true # test_free_after_iterating
12541249

‎Src/IronPythonTest/Cases/IronPythonCasesManifest.ini‎

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -178,14 +178,3 @@ Ignore=true
178178

179179
[IronPython.scripts.test_pystone]
180180
Ignore=true
181-
182-
# -------------------- The following worked in 3.4 ---------------------------
183-
184-
[IronPython.test_imp]
185-
Ignore=true # 1 failure
186-
187-
[IronPython.test_ssl_stdlib]
188-
Ignore=true # unittest.case.SkipTest: Cannot import name SSLSession
189-
190-
[IronPython.test_types_stdlib]
191-
Ignore=true # blocked by https://github.com/IronLanguages/ironpython3/issues/98

‎Src/StdLib/Lib/test/test_types.py‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1264,7 +1264,8 @@ def test_async_def(self):
12641264
# Test that types.coroutine passes 'async def' coroutines
12651265
# without modification
12661266

1267-
async def foo(): pass
1267+
# https://github.com/IronLanguages/ironpython3/issues/1428
1268+
# async def foo(): pass
12681269
foo_code = foo.__code__
12691270
foo_flags = foo.__code__.co_flags
12701271
decorated_foo = types.coroutine(foo)
@@ -1455,8 +1456,9 @@ def foo(): return Generator('spam')
14551456
wrapper = foo()
14561457
self.assertIsInstance(wrapper, types._GeneratorWrapper)
14571458

1458-
async def corofunc():
1459-
return await foo() + 100
1459+
# https://github.com/IronLanguages/ironpython3/issues/1428
1460+
# async def corofunc():
1461+
# return await foo() + 100
14601462
coro = corofunc()
14611463

14621464
self.assertEqual(coro.send(None), 'spam')

‎Tests/test_imp.py‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -319,25 +319,25 @@ def test_sys_path_none_builtins(self):
319319
#import some builtin modules not previously imported
320320
try:
321321
sys.path = [None] + prevPath
322-
self.assertNotIn('array', sorted(sys.modules.keys()))
323-
import array
324-
self.assertIn('array', sys.modules)
322+
self.assertNotIn('_csv', sorted(sys.modules.keys()))
323+
import _csv
324+
self.assertIn('_csv', sys.modules)
325325

326326
sys.path = prevPath + [None]
327327
self.assertNotIn('cmath', sys.modules)
328-
import array
328+
import _csv
329329
import cmath
330-
self.assertIn('array', sys.modules)
330+
self.assertIn('_csv', sys.modules)
331331
self.assertIn('cmath', sys.modules)
332332

333333
sys.path = [None]
334-
self.assertNotIn('_bisect', sys.modules)
335-
import array
334+
self.assertNotIn('xxsubtype', sys.modules)
335+
import _csv
336336
import cmath
337-
import _bisect
338-
self.assertIn('array', sys.modules)
337+
import xxsubtype
338+
self.assertIn('_csv', sys.modules)
339339
self.assertIn('cmath', sys.modules)
340-
self.assertIn('_bisect', sys.modules)
340+
self.assertIn('xxsubtype', sys.modules)
341341

342342
finally:
343343
sys.path = prevPath

‎Tests/test_ssl_stdlib.py‎

Lines changed: 34 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ def load_tests(loader, standard_tests, pattern):
1818
suite = unittest.TestSuite()
1919
suite.addTest(test.test_ssl.BasicSocketTests('test_DER_to_PEM'))
2020
suite.addTest(test.test_ssl.BasicSocketTests('test_asn1object'))
21-
suite.addTest(test.test_ssl.BasicSocketTests('test_cert_time_to_seconds'))
21+
suite.addTest(unittest.expectedFailure(test.test_ssl.BasicSocketTests('test_cert_time_to_seconds'))) # ValueError: time data does not match format
2222
suite.addTest(test.test_ssl.BasicSocketTests('test_cert_time_to_seconds_locale'))
2323
suite.addTest(test.test_ssl.BasicSocketTests('test_cert_time_to_seconds_timezone'))
2424
suite.addTest(test.test_ssl.BasicSocketTests('test_connect_ex_error'))
@@ -27,13 +27,13 @@ def load_tests(loader, standard_tests, pattern):
2727
suite.addTest(test.test_ssl.BasicSocketTests('test_empty_cert'))
2828
suite.addTest(test.test_ssl.BasicSocketTests('test_enum_certificates'))
2929
suite.addTest(unittest.expectedFailure(test.test_ssl.BasicSocketTests('test_enum_crls'))) # AssertionError: [] is not true
30-
suite.addTest(test.test_ssl.BasicSocketTests('test_errors_sslwrap'))
30+
suite.addTest(unittest.expectedFailure(test.test_ssl.BasicSocketTests('test_errors_sslwrap'))) # NotImplementedError: keyfile
3131
suite.addTest(unittest.expectedFailure(test.test_ssl.BasicSocketTests('test_get_default_verify_paths'))) # AttributeError: 'module' object has no attribute 'get_default_verify_paths'
3232
suite.addTest(test.test_ssl.BasicSocketTests('test_malformed_cert'))
3333
suite.addTest(test.test_ssl.BasicSocketTests('test_malformed_key'))
3434
suite.addTest(test.test_ssl.BasicSocketTests('test_match_hostname'))
3535
suite.addTest(test.test_ssl.BasicSocketTests('test_openssl_version'))
36-
suite.addTest(test.test_ssl.BasicSocketTests('test_parse_all_sans'))
36+
suite.addTest(unittest.expectedFailure(test.test_ssl.BasicSocketTests('test_parse_all_sans'))) # AssertionError
3737
suite.addTest(unittest.expectedFailure(test.test_ssl.BasicSocketTests('test_parse_cert'))) # KeyError: OCSP
3838
suite.addTest(unittest.expectedFailure(test.test_ssl.BasicSocketTests('test_parse_cert_CVE_2013_4238'))) # AssertionError: Tuples differ
3939
suite.addTest(unittest.expectedFailure(test.test_ssl.BasicSocketTests('test_parse_cert_CVE_2019_5010'))) # AssertionError
@@ -86,23 +86,23 @@ def load_tests(loader, standard_tests, pattern):
8686
suite.addTest(unittest.expectedFailure(test.test_ssl.SSLErrorTests('test_lib_reason'))) # AttributeError: 'SSLContext' object has no attribute 'load_dh_params'
8787
suite.addTest(unittest.expectedFailure(test.test_ssl.SSLErrorTests('test_str'))) # AssertionError: '[Errno 1] foo' != 'foo'
8888
suite.addTest(unittest.expectedFailure(test.test_ssl.SSLErrorTests('test_subclass'))) # TypeError: Value cannot be null.
89-
suite.addTest(test.test_ssl.SimpleBackgroundTests('test_bio_handshake'))
90-
suite.addTest(test.test_ssl.SimpleBackgroundTests('test_bio_read_write_data'))
91-
suite.addTest(test.test_ssl.SimpleBackgroundTests('test_ciphers'))
92-
suite.addTest(test.test_ssl.SimpleBackgroundTests('test_connect'))
93-
suite.addTest(test.test_ssl.SimpleBackgroundTests('test_connect_cadata'))
94-
suite.addTest(test.test_ssl.SimpleBackgroundTests('test_connect_capath'))
95-
suite.addTest(test.test_ssl.SimpleBackgroundTests('test_connect_ex'))
96-
suite.addTest(test.test_ssl.SimpleBackgroundTests('test_connect_fail'))
97-
suite.addTest(test.test_ssl.SimpleBackgroundTests('test_connect_with_context'))
98-
suite.addTest(test.test_ssl.SimpleBackgroundTests('test_connect_with_context_fail'))
99-
suite.addTest(test.test_ssl.SimpleBackgroundTests('test_context_setget'))
100-
suite.addTest(test.test_ssl.SimpleBackgroundTests('test_get_ca_certs_capath'))
101-
suite.addTest(test.test_ssl.SimpleBackgroundTests('test_get_server_certificate'))
102-
suite.addTest(test.test_ssl.SimpleBackgroundTests('test_get_server_certificate_fail'))
103-
suite.addTest(test.test_ssl.SimpleBackgroundTests('test_makefile_close'))
104-
suite.addTest(test.test_ssl.SimpleBackgroundTests('test_non_blocking_connect_ex'))
105-
suite.addTest(test.test_ssl.SimpleBackgroundTests('test_non_blocking_handshake'))
89+
#suite.addTest(test.test_ssl.SimpleBackgroundTests('test_bio_handshake'))
90+
#suite.addTest(test.test_ssl.SimpleBackgroundTests('test_bio_read_write_data'))
91+
#suite.addTest(test.test_ssl.SimpleBackgroundTests('test_ciphers'))
92+
#suite.addTest(test.test_ssl.SimpleBackgroundTests('test_connect'))
93+
#suite.addTest(test.test_ssl.SimpleBackgroundTests('test_connect_cadata'))
94+
#suite.addTest(test.test_ssl.SimpleBackgroundTests('test_connect_capath'))
95+
#suite.addTest(test.test_ssl.SimpleBackgroundTests('test_connect_ex'))
96+
#suite.addTest(test.test_ssl.SimpleBackgroundTests('test_connect_fail'))
97+
#suite.addTest(test.test_ssl.SimpleBackgroundTests('test_connect_with_context'))
98+
#suite.addTest(test.test_ssl.SimpleBackgroundTests('test_connect_with_context_fail'))
99+
#suite.addTest(test.test_ssl.SimpleBackgroundTests('test_context_setget'))
100+
#suite.addTest(test.test_ssl.SimpleBackgroundTests('test_get_ca_certs_capath'))
101+
#suite.addTest(test.test_ssl.SimpleBackgroundTests('test_get_server_certificate'))
102+
#suite.addTest(test.test_ssl.SimpleBackgroundTests('test_get_server_certificate_fail'))
103+
#suite.addTest(test.test_ssl.SimpleBackgroundTests('test_makefile_close'))
104+
#suite.addTest(test.test_ssl.SimpleBackgroundTests('test_non_blocking_connect_ex'))
105+
#suite.addTest(test.test_ssl.SimpleBackgroundTests('test_non_blocking_handshake'))
106106
suite.addTest(test.test_ssl.TestPostHandshakeAuth('test_pha_no_pha_client'))
107107
suite.addTest(test.test_ssl.TestPostHandshakeAuth('test_pha_no_pha_server'))
108108
suite.addTest(test.test_ssl.TestPostHandshakeAuth('test_pha_not_tls13'))
@@ -111,7 +111,7 @@ def load_tests(loader, standard_tests, pattern):
111111
suite.addTest(test.test_ssl.TestPostHandshakeAuth('test_pha_required'))
112112
suite.addTest(test.test_ssl.TestPostHandshakeAuth('test_pha_required_nocert'))
113113
suite.addTest(test.test_ssl.TestPostHandshakeAuth('test_pha_setter'))
114-
suite.addTest(test.test_ssl.ThreadedTests('test_alpn_protocols'))
114+
#suite.addTest(test.test_ssl.ThreadedTests('test_alpn_protocols'))
115115
#suite.addTest(test.test_ssl.ThreadedTests('test_asyncore_server')) # blocking
116116
#suite.addTest(test.test_ssl.ThreadedTests('test_check_hostname'))
117117
#suite.addTest(test.test_ssl.ThreadedTests('test_compression'))
@@ -124,27 +124,27 @@ def load_tests(loader, standard_tests, pattern):
124124
#suite.addTest(test.test_ssl.ThreadedTests('test_getpeercert')) # blocking
125125
suite.addTest(test.test_ssl.ThreadedTests('test_getpeercert_enotconn'))
126126
suite.addTest(unittest.expectedFailure(test.test_ssl.ThreadedTests('test_handshake_timeout'))) # TypeError: Value cannot be null.
127-
suite.addTest(test.test_ssl.ThreadedTests('test_no_shared_ciphers'))
128-
suite.addTest(test.test_ssl.ThreadedTests('test_nonblocking_send'))
129-
suite.addTest(test.test_ssl.ThreadedTests('test_npn_protocols'))
127+
#suite.addTest(test.test_ssl.ThreadedTests('test_no_shared_ciphers'))
128+
#suite.addTest(test.test_ssl.ThreadedTests('test_nonblocking_send'))
129+
#suite.addTest(test.test_ssl.ThreadedTests('test_npn_protocols'))
130130
#suite.addTest(test.test_ssl.ThreadedTests('test_protocol_sslv2'))
131131
#suite.addTest(test.test_ssl.ThreadedTests('test_protocol_sslv23'))
132132
#suite.addTest(test.test_ssl.ThreadedTests('test_protocol_sslv3'))
133133
#suite.addTest(test.test_ssl.ThreadedTests('test_protocol_tlsv1'))
134134
#suite.addTest(test.test_ssl.ThreadedTests('test_protocol_tlsv1_1'))
135135
#suite.addTest(test.test_ssl.ThreadedTests('test_protocol_tlsv1_2'))
136136
#suite.addTest(test.test_ssl.ThreadedTests('test_read_write_after_close_raises_valuerror')) # blocking
137-
suite.addTest(unittest.expectedFailure(test.test_ssl.ThreadedTests('test_recv_send'))) # NotImplementedError: keyfile
138-
suite.addTest(test.test_ssl.ThreadedTests('test_recv_zero'))
137+
#suite.addTest(unittest.expectedFailure(test.test_ssl.ThreadedTests('test_recv_send'))) # NotImplementedError: keyfile
138+
#suite.addTest(test.test_ssl.ThreadedTests('test_recv_zero'))
139139
suite.addTest(unittest.expectedFailure(test.test_ssl.ThreadedTests('test_rude_shutdown'))) # TypeError: Value cannot be null.
140-
suite.addTest(test.test_ssl.ThreadedTests('test_selected_alpn_protocol'))
141-
suite.addTest(test.test_ssl.ThreadedTests('test_selected_alpn_protocol_if_server_uses_alpn'))
140+
#suite.addTest(test.test_ssl.ThreadedTests('test_selected_alpn_protocol'))
141+
#suite.addTest(test.test_ssl.ThreadedTests('test_selected_alpn_protocol_if_server_uses_alpn'))
142142
#suite.addTest(test.test_ssl.ThreadedTests('test_selected_npn_protocol'))
143-
suite.addTest(test.test_ssl.ThreadedTests('test_sendfile'))
143+
#suite.addTest(test.test_ssl.ThreadedTests('test_sendfile'))
144144
#suite.addTest(test.test_ssl.ThreadedTests('test_server_accept'))
145-
suite.addTest(test.test_ssl.ThreadedTests('test_session'))
146-
suite.addTest(test.test_ssl.ThreadedTests('test_session_handling'))
147-
suite.addTest(test.test_ssl.ThreadedTests('test_shared_ciphers'))
145+
#suite.addTest(test.test_ssl.ThreadedTests('test_session'))
146+
#suite.addTest(test.test_ssl.ThreadedTests('test_session_handling'))
147+
#suite.addTest(test.test_ssl.ThreadedTests('test_shared_ciphers'))
148148
suite.addTest(unittest.expectedFailure(test.test_ssl.ThreadedTests('test_sni_callback'))) # AttributeError: 'SSLContext' object has no attribute 'set_servername_callback'
149149
suite.addTest(unittest.expectedFailure(test.test_ssl.ThreadedTests('test_sni_callback_alert'))) # AttributeError: 'SSLContext' object has no attribute 'set_servername_callback'
150150
suite.addTest(unittest.expectedFailure(test.test_ssl.ThreadedTests('test_sni_callback_raising'))) # AttributeError: 'SSLContext' object has no attribute 'set_servername_callback'
@@ -153,8 +153,8 @@ def load_tests(loader, standard_tests, pattern):
153153
#suite.addTest(test.test_ssl.ThreadedTests('test_starttls')) # blocking
154154
suite.addTest(test.test_ssl.ThreadedTests('test_tls1_3'))
155155
suite.addTest(test.test_ssl.ThreadedTests('test_tls_unique_channel_binding'))
156-
suite.addTest(test.test_ssl.ThreadedTests('test_version_basic'))
157-
suite.addTest(test.test_ssl.ThreadedTests('test_wrong_cert'))
156+
#suite.addTest(unittest.expectedFailure(test.test_ssl.ThreadedTests('test_version_basic')))
157+
#suite.addTest(unittest.expectedFailure(test.test_ssl.ThreadedTests('test_wrong_cert')))
158158
return suite
159159

160160
else:

0 commit comments

Comments
 (0)