Skip to content

Commit f51c636

Browse files
msimacekmsimacek
committed
[GR-21590] Update imports
PullRequest: graalpython/3799
2 parents c0b9b9c + 4d4b021 commit f51c636

18 files changed

+64
-41
lines changed

‎ci.jsonnet‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{ "overlay": "1f06979c2fc643ef5d92c903790114a063ce486f" }
1+
{ "overlay": "a74e2e4ae250150f0f974c20c80ac212a9116ea1" }

‎graalpython/com.oracle.graal.python.test/src/tests/test_repl.py‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,23 @@
5050
import termios
5151
from textwrap import dedent
5252

53+
# The terminal tests can be flaky
54+
def autoretry(fn):
55+
def decorated(*args, **kwargs):
56+
retries = 3
57+
while retries:
58+
try:
59+
fn(*args, **kwargs)
60+
return
61+
except Exception:
62+
retries -= 1
63+
print("Retrying test")
64+
continue
65+
fn(*args, **kwargs)
66+
return decorated
5367

68+
69+
@autoretry
5470
def validate_repl(stdin, python_args=(), ignore_preamble=True):
5571
env = os.environ.copy()
5672
env['TERM'] = 'ansi'

‎graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_cmd_line.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,5 +21,5 @@ test.test_cmd_line.CmdLineTest.test_unbuffered_input @ darwin-arm64,darwin-x86_6
2121
test.test_cmd_line.CmdLineTest.test_unbuffered_output @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
2222
test.test_cmd_line.CmdLineTest.test_unmached_quote @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
2323
test.test_cmd_line.CmdLineTest.test_verbose @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
24-
test.test_cmd_line.CmdLineTest.test_version @ linux-x86_64
24+
test.test_cmd_line.CmdLineTest.test_version @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
2525
test.test_cmd_line.IgnoreEnvironmentTest.test_ignore_PYTHONPATH @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64

‎graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_exceptions.txt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
test.test_exceptions.AttributeErrorTests.test_attribute_error_with_bad_name @ linux-x86_64
1+
test.test_exceptions.AttributeErrorTests.test_attribute_error_with_bad_name @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
22
test.test_exceptions.AttributeErrorTests.test_attribute_error_with_failing_dict @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
3-
test.test_exceptions.AttributeErrorTests.test_attributes @ linux-x86_64
3+
test.test_exceptions.AttributeErrorTests.test_attributes @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
44
test.test_exceptions.AttributeErrorTests.test_getattr_error_bad_suggestions_do_not_trigger_for_small_names @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
5-
test.test_exceptions.AttributeErrorTests.test_getattr_has_name_and_obj @ linux-x86_64
6-
test.test_exceptions.AttributeErrorTests.test_getattr_has_name_and_obj_for_method @ linux-x86_64
5+
test.test_exceptions.AttributeErrorTests.test_getattr_has_name_and_obj @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
6+
test.test_exceptions.AttributeErrorTests.test_getattr_has_name_and_obj_for_method @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
77
test.test_exceptions.AttributeErrorTests.test_getattr_suggestions_do_not_trigger_for_big_dicts @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
88
test.test_exceptions.AttributeErrorTests.test_getattr_suggestions_do_not_trigger_for_long_attributes @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
99
test.test_exceptions.AttributeErrorTests.test_getattr_suggestions_for_same_name @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64

‎graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_hashlib.txt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,13 +27,13 @@ test.test_hashlib.HashLibTestCase.test_case_sha384_1 @ darwin-arm64,darwin-x86_6
2727
test.test_hashlib.HashLibTestCase.test_case_sha384_2 @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
2828
test.test_hashlib.HashLibTestCase.test_case_sha384_3 @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
2929
test.test_hashlib.HashLibTestCase.test_case_sha3_224_0 @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
30-
test.test_hashlib.HashLibTestCase.test_case_sha3_224_vector @ darwin-arm64,darwin-x86_64,linux-x86_64,win32-AMD64
30+
test.test_hashlib.HashLibTestCase.test_case_sha3_224_vector @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
3131
test.test_hashlib.HashLibTestCase.test_case_sha3_256_0 @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
32-
test.test_hashlib.HashLibTestCase.test_case_sha3_256_vector @ darwin-arm64,darwin-x86_64,linux-x86_64,win32-AMD64
32+
test.test_hashlib.HashLibTestCase.test_case_sha3_256_vector @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
3333
test.test_hashlib.HashLibTestCase.test_case_sha3_384_0 @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
34-
test.test_hashlib.HashLibTestCase.test_case_sha3_384_vector @ darwin-arm64,darwin-x86_64,linux-x86_64,win32-AMD64
34+
test.test_hashlib.HashLibTestCase.test_case_sha3_384_vector @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
3535
test.test_hashlib.HashLibTestCase.test_case_sha3_512_0 @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
36-
test.test_hashlib.HashLibTestCase.test_case_sha3_512_vector @ darwin-arm64,darwin-x86_64,linux-x86_64,win32-AMD64
36+
test.test_hashlib.HashLibTestCase.test_case_sha3_512_vector @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
3737
test.test_hashlib.HashLibTestCase.test_case_sha512_0 @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
3838
test.test_hashlib.HashLibTestCase.test_case_sha512_1 @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
3939
test.test_hashlib.HashLibTestCase.test_case_sha512_2 @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64

‎graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_inspect.txt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -160,6 +160,7 @@ test.test_inspect.test_inspect.TestPredicates.test_get_slot_members @ darwin-arm
160160
test.test_inspect.test_inspect.TestPredicates.test_isabstract @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
161161
test.test_inspect.test_inspect.TestPredicates.test_isabstract_during_init_subclass @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
162162
test.test_inspect.test_inspect.TestPredicates.test_isclass @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
163+
test.test_inspect.test_inspect.TestPredicates.test_iscoroutine @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
163164
test.test_inspect.test_inspect.TestPredicates.test_isroutine @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
164165
test.test_inspect.test_inspect.TestReload.test_getsource_reload @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
165166
test.test_inspect.test_inspect.TestRetrievingSourceCode.test_cleandoc @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64

‎graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_int.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Transiently fails because it's dependent on timings
22
!test.test_int.IntStrDigitLimitsTests.test_denial_of_service_prevented_int_to_str @ darwin-arm64,linux-aarch64,linux-x86_64
3-
test.test_int.IntStrDigitLimitsTests.test_denial_of_service_prevented_str_to_int @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
3+
!test.test_int.IntStrDigitLimitsTests.test_denial_of_service_prevented_str_to_int @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
44
test.test_int.IntStrDigitLimitsTests.test_disabled_limit @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
55
test.test_int.IntStrDigitLimitsTests.test_int_from_other_bases @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
66
test.test_int.IntStrDigitLimitsTests.test_max_str_digits @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
@@ -10,7 +10,7 @@ test.test_int.IntStrDigitLimitsTests.test_sign_not_counted @ darwin-arm64,darwin
1010
test.test_int.IntStrDigitLimitsTests.test_underscores_ignored @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
1111
# Transiently fails because it's dependent on timings
1212
!test.test_int.IntSubclassStrDigitLimitsTests.test_denial_of_service_prevented_int_to_str @ darwin-arm64,linux-aarch64,linux-x86_64
13-
test.test_int.IntSubclassStrDigitLimitsTests.test_denial_of_service_prevented_str_to_int @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
13+
!test.test_int.IntSubclassStrDigitLimitsTests.test_denial_of_service_prevented_str_to_int @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
1414
test.test_int.IntSubclassStrDigitLimitsTests.test_disabled_limit @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
1515
test.test_int.IntSubclassStrDigitLimitsTests.test_int_from_other_bases @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
1616
test.test_int.IntSubclassStrDigitLimitsTests.test_max_str_digits @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64

‎graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_isinstance.txt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ test.test_isinstance.TestIsInstanceExceptions.test_isinstance_dont_mask_non_attr
55
test.test_isinstance.TestIsInstanceExceptions.test_mask_attribute_error @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
66
test.test_isinstance.TestIsInstanceIsSubclass.test_infinite_cycle_in_bases @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
77
test.test_isinstance.TestIsInstanceIsSubclass.test_infinite_recursion_in_bases @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
8+
test.test_isinstance.TestIsInstanceIsSubclass.test_infinite_recursion_via_bases_tuple @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
89
test.test_isinstance.TestIsInstanceIsSubclass.test_infinitely_many_bases @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
910
test.test_isinstance.TestIsInstanceIsSubclass.test_isinstance_abstract @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
1011
test.test_isinstance.TestIsInstanceIsSubclass.test_isinstance_normal @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64

‎graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_mmap.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
test.test_mmap.LargeMmapTests.test_large_offset @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
22
test.test_mmap.MmapTests.test_anonymous @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
33
test.test_mmap.MmapTests.test_bad_file_desc @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
4-
test.test_mmap.MmapTests.test_basic @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64
4+
test.test_mmap.MmapTests.test_basic @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
55
test.test_mmap.MmapTests.test_concat_repeat_exception @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
66
test.test_mmap.MmapTests.test_context_manager @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
77
test.test_mmap.MmapTests.test_context_manager_exception @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64

‎graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_tarfile.txt‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -261,12 +261,12 @@ test.test_tarfile.GzipWriteTest.test_tar_size @ darwin-arm64,darwin-x86_64,linux
261261
test.test_tarfile.HardlinkTest.test_add_hardlink @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64
262262
test.test_tarfile.HardlinkTest.test_add_twice @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64
263263
test.test_tarfile.HardlinkTest.test_dereference_hardlink @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64
264-
test.test_tarfile.LimitsTest.test_gnu_limits @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64
265-
test.test_tarfile.LimitsTest.test_pax_limits @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64
266-
test.test_tarfile.LimitsTest.test_ustar_limits @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64
267-
test.test_tarfile.ListTest.test_list @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64
268-
test.test_tarfile.ListTest.test_list_members @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64
269-
test.test_tarfile.LzmaAppendTest.test_append_compressed @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64
264+
test.test_tarfile.LimitsTest.test_gnu_limits @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
265+
test.test_tarfile.LimitsTest.test_pax_limits @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
266+
test.test_tarfile.LimitsTest.test_ustar_limits @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
267+
test.test_tarfile.ListTest.test_list @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
268+
test.test_tarfile.ListTest.test_list_members @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
269+
test.test_tarfile.LzmaAppendTest.test_append_compressed @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
270270
test.test_tarfile.LzmaCreateTest.test_create @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64
271271
test.test_tarfile.LzmaCreateTest.test_create_existing @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64
272272
test.test_tarfile.LzmaCreateTest.test_create_existing_taropen @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64

0 commit comments

Comments
 (0)