Skip to content

Commit 770c867

Browse files
committed
Downgraded skips in tests
1 parent 69601a1 commit 770c867

Some content is hidden

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

42 files changed

+107
-139
lines changed

Lib/test/test_ast/test_ast.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2183,7 +2183,7 @@ def test_yield(self):
21832183
self.expr(ast.Yield(ast.Name("x", ast.Store())), "must have Load")
21842184
self.expr(ast.YieldFrom(ast.Name("x", ast.Store())), "must have Load")
21852185

2186-
@unittest.skip("TODO: RUSTPYTHON; thread 'main' panicked")
2186+
@unittest.skip('TODO: RUSTPYTHON; thread "main" panicked')
21872187
def test_compare(self):
21882188
left = ast.Name("x", ast.Load())
21892189
comp = ast.Compare(left, [ast.In()], [])
@@ -2396,7 +2396,7 @@ def test_stdlib_validates(self):
23962396
ast.MatchMapping([], [], rest="_"),
23972397
]
23982398

2399-
@unittest.skip("TODO: RUSTPYTHON; thread 'main' panicked")
2399+
@unittest.expectedFailure # TODO: RUSTPYTHON; thread 'main' panicked
24002400
def test_match_validation_pattern(self):
24012401
name_x = ast.Name("x", ast.Load())
24022402
for pattern in self._MATCH_PATTERNS:

Lib/test/test_bdb.py

Lines changed: 33 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -590,7 +590,7 @@ def fail(self, msg=None):
590590
class StateTestCase(BaseTestCase):
591591
"""Test the step, next, return, until and quit 'set_' methods."""
592592

593-
@unittest.skip('TODO: RUSTPYTHON; Error in atexit._run_exitfuncs')
593+
@unittest.expectedFailure # TODO: RUSTPYTHON; Error in atexit._run_exitfuncs
594594
def test_step(self):
595595
self.expect_set = [
596596
('line', 2, 'tfunc_main'), ('step', ),
@@ -601,7 +601,7 @@ def test_step(self):
601601
with TracerRun(self) as tracer:
602602
tracer.runcall(tfunc_main)
603603

604-
@unittest.skip('TODO: RUSTPYTHON; Error in atexit._run_exitfuncs')
604+
@unittest.expectedFailure # TODO: RUSTPYTHON; Error in atexit._run_exitfuncs
605605
def test_step_next_on_last_statement(self):
606606
for set_type in ('step', 'next'):
607607
with self.subTest(set_type=set_type):
@@ -616,8 +616,8 @@ def test_step_next_on_last_statement(self):
616616
with TracerRun(self) as tracer:
617617
tracer.runcall(tfunc_main)
618618

619-
@unittest.skip('TODO: RUSTPYTHON')
620619
# AssertionError: All paired tuples have not been processed, the last one was number 1 [('next',), ('quit',)]
620+
@unittest.expectedFailure # TODO: RUSTPYTHON
621621
def test_stepinstr(self):
622622
self.expect_set = [
623623
('line', 2, 'tfunc_main'), ('stepinstr', ),
@@ -627,7 +627,7 @@ def test_stepinstr(self):
627627
with TracerRun(self) as tracer:
628628
tracer.runcall(tfunc_main)
629629

630-
@unittest.skip('TODO: RUSTPYTHON; Error in atexit._run_exitfuncs')
630+
@unittest.expectedFailure # TODO: RUSTPYTHON; Error in atexit._run_exitfuncs
631631
def test_next(self):
632632
self.expect_set = [
633633
('line', 2, 'tfunc_main'), ('step', ),
@@ -639,7 +639,7 @@ def test_next(self):
639639
with TracerRun(self) as tracer:
640640
tracer.runcall(tfunc_main)
641641

642-
@unittest.skip('TODO: RUSTPYTHON; Error in atexit._run_exitfuncs')
642+
@unittest.expectedFailure # TODO: RUSTPYTHON; Error in atexit._run_exitfuncs
643643
def test_next_over_import(self):
644644
code = """
645645
def main():
@@ -654,7 +654,7 @@ def main():
654654
with TracerRun(self) as tracer:
655655
tracer.runcall(tfunc_import)
656656

657-
@unittest.skip('TODO: RUSTPYTHON; Error in atexit._run_exitfuncs')
657+
@unittest.expectedFailure # TODO: RUSTPYTHON; Error in atexit._run_exitfuncs
658658
def test_next_on_plain_statement(self):
659659
# Check that set_next() is equivalent to set_step() on a plain
660660
# statement.
@@ -667,7 +667,7 @@ def test_next_on_plain_statement(self):
667667
with TracerRun(self) as tracer:
668668
tracer.runcall(tfunc_main)
669669

670-
@unittest.skip('TODO: RUSTPYTHON; Error in atexit._run_exitfuncs')
670+
@unittest.expectedFailure # TODO: RUSTPYTHON; Error in atexit._run_exitfuncs
671671
def test_next_in_caller_frame(self):
672672
# Check that set_next() in the caller frame causes the tracer
673673
# to stop next in the caller frame.
@@ -681,7 +681,7 @@ def test_next_in_caller_frame(self):
681681
with TracerRun(self) as tracer:
682682
tracer.runcall(tfunc_main)
683683

684-
@unittest.skip('TODO: RUSTPYTHON; Error in atexit._run_exitfuncs')
684+
@unittest.expectedFailure # TODO: RUSTPYTHON; Error in atexit._run_exitfuncs
685685
def test_return(self):
686686
self.expect_set = [
687687
('line', 2, 'tfunc_main'), ('step', ),
@@ -694,7 +694,7 @@ def test_return(self):
694694
with TracerRun(self) as tracer:
695695
tracer.runcall(tfunc_main)
696696

697-
@unittest.skip('TODO: RUSTPYTHON; Error in atexit._run_exitfuncs')
697+
@unittest.expectedFailure # TODO: RUSTPYTHON; Error in atexit._run_exitfuncs
698698
def test_return_in_caller_frame(self):
699699
self.expect_set = [
700700
('line', 2, 'tfunc_main'), ('step', ),
@@ -706,7 +706,7 @@ def test_return_in_caller_frame(self):
706706
with TracerRun(self) as tracer:
707707
tracer.runcall(tfunc_main)
708708

709-
@unittest.skip('TODO: RUSTPYTHON; Error in atexit._run_exitfuncs')
709+
@unittest.expectedFailure # TODO: RUSTPYTHON; Error in atexit._run_exitfuncs
710710
def test_until(self):
711711
self.expect_set = [
712712
('line', 2, 'tfunc_main'), ('step', ),
@@ -718,7 +718,7 @@ def test_until(self):
718718
with TracerRun(self) as tracer:
719719
tracer.runcall(tfunc_main)
720720

721-
@unittest.skip('TODO: RUSTPYTHON; Error in atexit._run_exitfuncs')
721+
@unittest.expectedFailure # TODO: RUSTPYTHON; Error in atexit._run_exitfuncs
722722
def test_until_with_too_large_count(self):
723723
self.expect_set = [
724724
('line', 2, 'tfunc_main'), break_in_func('tfunc_first'),
@@ -729,7 +729,7 @@ def test_until_with_too_large_count(self):
729729
with TracerRun(self) as tracer:
730730
tracer.runcall(tfunc_main)
731731

732-
@unittest.skip('TODO: RUSTPYTHON; Error in atexit._run_exitfuncs')
732+
@unittest.expectedFailure # TODO: RUSTPYTHON; Error in atexit._run_exitfuncs
733733
def test_until_in_caller_frame(self):
734734
self.expect_set = [
735735
('line', 2, 'tfunc_main'), ('step', ),
@@ -741,7 +741,7 @@ def test_until_in_caller_frame(self):
741741
with TracerRun(self) as tracer:
742742
tracer.runcall(tfunc_main)
743743

744-
@unittest.skip('TODO: RUSTPYTHON; Error in atexit._run_exitfuncs')
744+
@unittest.expectedFailure # TODO: RUSTPYTHON; Error in atexit._run_exitfuncs
745745
@patch_list(sys.meta_path)
746746
def test_skip(self):
747747
# Check that tracing is skipped over the import statement in
@@ -775,7 +775,7 @@ def test_skip_with_no_name_module(self):
775775
bdb = Bdb(skip=['anything*'])
776776
self.assertIs(bdb.is_skipped_module(None), False)
777777

778-
@unittest.skip('TODO: RUSTPYTHON; Error in atexit._run_exitfuncs')
778+
@unittest.expectedFailure # TODO: RUSTPYTHON; Error in atexit._run_exitfuncs
779779
def test_down(self):
780780
# Check that set_down() raises BdbError at the newest frame.
781781
self.expect_set = [
@@ -784,7 +784,7 @@ def test_down(self):
784784
with TracerRun(self) as tracer:
785785
self.assertRaises(BdbError, tracer.runcall, tfunc_main)
786786

787-
@unittest.skip('TODO: RUSTPYTHON; Error in atexit._run_exitfuncs')
787+
@unittest.expectedFailure # TODO: RUSTPYTHON; Error in atexit._run_exitfuncs
788788
def test_up(self):
789789
self.expect_set = [
790790
('line', 2, 'tfunc_main'), ('step', ),
@@ -798,15 +798,15 @@ def test_up(self):
798798
class BreakpointTestCase(BaseTestCase):
799799
"""Test the breakpoint set method."""
800800

801-
@unittest.skip('TODO: RUSTPYTHON; Error in atexit._run_exitfuncs')
801+
@unittest.expectedFailure # TODO: RUSTPYTHON; Error in atexit._run_exitfuncs
802802
def test_bp_on_non_existent_module(self):
803803
self.expect_set = [
804804
('line', 2, 'tfunc_import'), ('break', ('/non/existent/module.py', 1))
805805
]
806806
with TracerRun(self) as tracer:
807807
self.assertRaises(BdbError, tracer.runcall, tfunc_import)
808808

809-
@unittest.skip('TODO: RUSTPYTHON; Error in atexit._run_exitfuncs')
809+
@unittest.expectedFailure # TODO: RUSTPYTHON; Error in atexit._run_exitfuncs
810810
def test_bp_after_last_statement(self):
811811
code = """
812812
def main():
@@ -820,7 +820,7 @@ def main():
820820
with TracerRun(self) as tracer:
821821
self.assertRaises(BdbError, tracer.runcall, tfunc_import)
822822

823-
@unittest.skip('TODO: RUSTPYTHON; Error in atexit._run_exitfuncs')
823+
@unittest.expectedFailure # TODO: RUSTPYTHON; Error in atexit._run_exitfuncs
824824
def test_temporary_bp(self):
825825
code = """
826826
def func():
@@ -844,7 +844,7 @@ def main():
844844
with TracerRun(self) as tracer:
845845
tracer.runcall(tfunc_import)
846846

847-
@unittest.skip('TODO: RUSTPYTHON; Error in atexit._run_exitfuncs')
847+
@unittest.expectedFailure # TODO: RUSTPYTHON; Error in atexit._run_exitfuncs
848848
def test_disabled_temporary_bp(self):
849849
code = """
850850
def func():
@@ -873,7 +873,7 @@ def main():
873873
with TracerRun(self) as tracer:
874874
tracer.runcall(tfunc_import)
875875

876-
@unittest.skip('TODO: RUSTPYTHON; Error in atexit._run_exitfuncs')
876+
@unittest.expectedFailure # TODO: RUSTPYTHON; Error in atexit._run_exitfuncs
877877
def test_bp_condition(self):
878878
code = """
879879
def func(a):
@@ -894,7 +894,7 @@ def main():
894894
with TracerRun(self) as tracer:
895895
tracer.runcall(tfunc_import)
896896

897-
@unittest.skip('TODO: RUSTPYTHON; Error in atexit._run_exitfuncs')
897+
@unittest.expectedFailure # TODO: RUSTPYTHON; Error in atexit._run_exitfuncs
898898
def test_bp_exception_on_condition_evaluation(self):
899899
code = """
900900
def func(a):
@@ -914,7 +914,7 @@ def main():
914914
with TracerRun(self) as tracer:
915915
tracer.runcall(tfunc_import)
916916

917-
@unittest.skip('TODO: RUSTPYTHON; Error in atexit._run_exitfuncs')
917+
@unittest.expectedFailure # TODO: RUSTPYTHON; Error in atexit._run_exitfuncs
918918
def test_bp_ignore_count(self):
919919
code = """
920920
def func():
@@ -936,7 +936,7 @@ def main():
936936
with TracerRun(self) as tracer:
937937
tracer.runcall(tfunc_import)
938938

939-
@unittest.skip('TODO: RUSTPYTHON; Error in atexit._run_exitfuncs')
939+
@unittest.expectedFailure # TODO: RUSTPYTHON; Error in atexit._run_exitfuncs
940940
def test_ignore_count_on_disabled_bp(self):
941941
code = """
942942
def func():
@@ -964,7 +964,7 @@ def main():
964964
with TracerRun(self) as tracer:
965965
tracer.runcall(tfunc_import)
966966

967-
@unittest.skip('TODO: RUSTPYTHON; Error in atexit._run_exitfuncs')
967+
@unittest.expectedFailure # TODO: RUSTPYTHON; Error in atexit._run_exitfuncs
968968
def test_clear_two_bp_on_same_line(self):
969969
code = """
970970
def func():
@@ -990,7 +990,7 @@ def main():
990990
with TracerRun(self) as tracer:
991991
tracer.runcall(tfunc_import)
992992

993-
@unittest.skip('TODO: RUSTPYTHON; Error in atexit._run_exitfuncs')
993+
@unittest.expectedFailure # TODO: RUSTPYTHON; Error in atexit._run_exitfuncs
994994
def test_clear_at_no_bp(self):
995995
self.expect_set = [
996996
('line', 2, 'tfunc_import'), ('clear', (__file__, 1))
@@ -1044,7 +1044,7 @@ def test_load_bps_from_previous_Bdb_instance(self):
10441044
class RunTestCase(BaseTestCase):
10451045
"""Test run, runeval and set_trace."""
10461046

1047-
@unittest.skip('TODO: RUSTPYTHON; Error in atexit._run_exitfuncs')
1047+
@unittest.expectedFailure # TODO: RUSTPYTHON; Error in atexit._run_exitfuncs
10481048
def test_run_step(self):
10491049
# Check that the bdb 'run' method stops at the first line event.
10501050
code = """
@@ -1057,7 +1057,7 @@ def test_run_step(self):
10571057
with TracerRun(self) as tracer:
10581058
tracer.run(compile(textwrap.dedent(code), '<string>', 'exec'))
10591059

1060-
@unittest.skip('TODO: RUSTPYTHON; Error in atexit._run_exitfuncs')
1060+
@unittest.expectedFailure # TODO: RUSTPYTHON; Error in atexit._run_exitfuncs
10611061
def test_runeval_step(self):
10621062
# Test bdb 'runeval'.
10631063
code = """
@@ -1080,7 +1080,7 @@ def main():
10801080
class IssuesTestCase(BaseTestCase):
10811081
"""Test fixed bdb issues."""
10821082

1083-
@unittest.skip('TODO: RUSTPYTHON; Error in atexit._run_exitfuncs')
1083+
@unittest.expectedFailure # TODO: RUSTPYTHON; Error in atexit._run_exitfuncs
10841084
def test_step_at_return_with_no_trace_in_caller(self):
10851085
# Issue #13183.
10861086
# Check that the tracer does step into the caller frame when the
@@ -1111,7 +1111,7 @@ def func():
11111111
with TracerRun(self) as tracer:
11121112
tracer.runcall(tfunc_import)
11131113

1114-
@unittest.skip('TODO: RUSTPYTHON; Error in atexit._run_exitfuncs')
1114+
@unittest.expectedFailure # TODO: RUSTPYTHON; Error in atexit._run_exitfuncs
11151115
def test_next_until_return_in_generator(self):
11161116
# Issue #16596.
11171117
# Check that set_next(), set_until() and set_return() do not treat the
@@ -1153,7 +1153,7 @@ def main():
11531153
with TracerRun(self) as tracer:
11541154
tracer.runcall(tfunc_import)
11551155

1156-
@unittest.skip('TODO: RUSTPYTHON; Error in atexit._run_exitfuncs')
1156+
@unittest.expectedFailure # TODO: RUSTPYTHON; Error in atexit._run_exitfuncs
11571157
def test_next_command_in_generator_for_loop(self):
11581158
# Issue #16596.
11591159
code = """
@@ -1185,7 +1185,7 @@ def main():
11851185
with TracerRun(self) as tracer:
11861186
tracer.runcall(tfunc_import)
11871187

1188-
@unittest.skip('TODO: RUSTPYTHON; Error in atexit._run_exitfuncs')
1188+
@unittest.expectedFailure # TODO: RUSTPYTHON; Error in atexit._run_exitfuncs
11891189
def test_next_command_in_generator_with_subiterator(self):
11901190
# Issue #16596.
11911191
code = """
@@ -1217,7 +1217,7 @@ def main():
12171217
with TracerRun(self) as tracer:
12181218
tracer.runcall(tfunc_import)
12191219

1220-
@unittest.skip('TODO: RUSTPYTHON; Error in atexit._run_exitfuncs')
1220+
@unittest.expectedFailure # TODO: RUSTPYTHON; Error in atexit._run_exitfuncs
12211221
def test_return_command_in_generator_with_subiterator(self):
12221222
# Issue #16596.
12231223
code = """
@@ -1249,8 +1249,8 @@ def main():
12491249
with TracerRun(self) as tracer:
12501250
tracer.runcall(tfunc_import)
12511251

1252-
@unittest.skip('TODO: RUSTPYTHON')
12531252
# AssertionError: All paired tuples have not been processed, the last one was number 1 [('next',)]
1253+
@unittest.expectedFailure # TODO: RUSTPYTHON
12541254
def test_next_to_botframe(self):
12551255
# gh-125422
12561256
# Check that next command won't go to the bottom frame.

Lib/test/test_bytes.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2138,7 +2138,6 @@ def test_join(self):
21382138
s3 = s1.join([b"abcd"])
21392139
self.assertIs(type(s3), self.basetype)
21402140

2141-
@unittest.skip('TODO: RUSTPYTHON; Fails on ByteArraySubclassWithSlotsTest')
21422141
def test_pickle(self):
21432142
a = self.type2test(b"abcd")
21442143
a.x = 10
@@ -2153,7 +2152,6 @@ def test_pickle(self):
21532152
self.assertEqual(type(a.z), type(b.z))
21542153
self.assertFalse(hasattr(b, 'y'))
21552154

2156-
@unittest.skip('TODO: RUSTPYTHON; Fails on ByteArraySubclassWithSlotsTest')
21572155
def test_copy(self):
21582156
a = self.type2test(b"abcd")
21592157
a.x = 10

Lib/test/test_class.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -554,7 +554,7 @@ class Custom:
554554
self.assertFalse(hasattr(o, "__call__"))
555555
self.assertFalse(hasattr(c, "__call__"))
556556

557-
@unittest.skip("TODO: RUSTPYTHON, segmentation fault")
557+
@unittest.skip('TODO: RUSTPYTHON; segmentation fault')
558558
def testSFBug532646(self):
559559
# Test for SF bug 532646
560560

@@ -611,7 +611,6 @@ def assertNotOrderable(self, a, b):
611611
with self.assertRaises(TypeError):
612612
a >= b
613613

614-
@unittest.skip("TODO: RUSTPYTHON; unstable result")
615614
def testHashComparisonOfMethods(self):
616615
# Test comparison and hash of methods
617616
class A:
@@ -979,7 +978,6 @@ class Bar: pass
979978
self.assertIsInstance(f, Bar)
980979
self.assertEqual(f.__dict__, {})
981980

982-
@unittest.skip("TODO: RUSTPYTHON, unexpectedly long runtime")
983981
def test_store_attr_type_cache(self):
984982
"""Verifies that the type cache doesn't provide a value which is
985983
inconsistent from the dict."""

Lib/test/test_cmd_line_script.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -209,19 +209,19 @@ def check_repl_stderr_flush(self, separate_stderr=False):
209209
self.assertIn(b'File "<stdin>"', stderr.readline())
210210
self.assertIn(b'ZeroDivisionError', stderr.readline())
211211

212-
@unittest.skip("TODO: RUSTPYTHON, test hang in middle")
212+
@unittest.skip('TODO: RUSTPYTHON; hanging')
213213
def test_repl_stdout_flush(self):
214214
self.check_repl_stdout_flush()
215215

216-
@unittest.skip("TODO: RUSTPYTHON, test hang in middle")
216+
@unittest.skip('TODO: RUSTPYTHON; hanging')
217217
def test_repl_stdout_flush_separate_stderr(self):
218218
self.check_repl_stdout_flush(True)
219219

220-
@unittest.skip("TODO: RUSTPYTHON, test hang in middle")
220+
@unittest.skip('TODO: RUSTPYTHON; hanging')
221221
def test_repl_stderr_flush(self):
222222
self.check_repl_stderr_flush()
223223

224-
@unittest.skip("TODO: RUSTPYTHON, test hang in middle")
224+
@unittest.skip('TODO: RUSTPYTHON; hanging')
225225
def test_repl_stderr_flush_separate_stderr(self):
226226
self.check_repl_stderr_flush(True)
227227

Lib/test/test_compile.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,6 @@ def __getitem__(self, key):
108108
exec('z = a', g, d)
109109
self.assertEqual(d['z'], 12)
110110

111-
@unittest.skip("TODO: RUSTPYTHON; segmentation fault")
112111
def test_extended_arg(self):
113112
# default: 1000 * 2.5 = 2500 repetitions
114113
repeat = int(sys.getrecursionlimit() * 2.5)

Lib/test/test_configparser.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -762,7 +762,6 @@ def test_read_returns_file_list(self):
762762
parsed_files = cf.read([], encoding="utf-8")
763763
self.assertEqual(parsed_files, [])
764764

765-
@unittest.skip("TODO: RUSTPYTHON, suspected to make CI hang")
766765
def test_read_returns_file_list_with_bytestring_path(self):
767766
if self.delimiters[0] != '=':
768767
self.skipTest('incompatible format')

0 commit comments

Comments
 (0)