Skip to content

Commit 859e7de

Browse files
cosminbascacosminbasca
committed
[GR-23261] get test_import to pass
PullRequest: graalpython/1236
2 parents 3286cb6 + 2123083 commit 859e7de

File tree

74 files changed

+793
-813
lines changed

Some content is hidden

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

74 files changed

+793
-813
lines changed

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

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
*graalpython.lib-python.3.test.test_import.__init__.CircularImportTests.test_binding
2+
*graalpython.lib-python.3.test.test_import.__init__.CircularImportTests.test_circular_from_import
13
*graalpython.lib-python.3.test.test_import.__init__.CircularImportTests.test_crossreference1
24
*graalpython.lib-python.3.test.test_import.__init__.CircularImportTests.test_crossreference2
35
*graalpython.lib-python.3.test.test_import.__init__.CircularImportTests.test_direct
@@ -6,6 +8,7 @@
68
*graalpython.lib-python.3.test.test_import.__init__.CircularImportTests.test_subpackage
79
*graalpython.lib-python.3.test.test_import.__init__.FilePermissionTests.test_cached_mode_issue_2051
810
*graalpython.lib-python.3.test.test_import.__init__.FilePermissionTests.test_cached_readonly
11+
*graalpython.lib-python.3.test.test_import.__init__.FilePermissionTests.test_creation_mode
912
*graalpython.lib-python.3.test.test_import.__init__.FilePermissionTests.test_pyc_always_writable
1013
*graalpython.lib-python.3.test.test_import.__init__.GetSourcefileTests.test_get_sourcefile
1114
*graalpython.lib-python.3.test.test_import.__init__.GetSourcefileTests.test_get_sourcefile_bad_ext
@@ -17,13 +20,18 @@
1720
*graalpython.lib-python.3.test.test_import.__init__.ImportTests.test_dll_dependency_import
1821
*graalpython.lib-python.3.test.test_import.__init__.ImportTests.test_double_const
1922
*graalpython.lib-python.3.test.test_import.__init__.ImportTests.test_failing_import_sticks
23+
*graalpython.lib-python.3.test.test_import.__init__.ImportTests.test_failing_reload
2024
*graalpython.lib-python.3.test.test_import.__init__.ImportTests.test_file_to_source
25+
*graalpython.lib-python.3.test.test_import.__init__.ImportTests.test_from_import_AttributeError
2126
*graalpython.lib-python.3.test.test_import.__init__.ImportTests.test_from_import_message_for_existing_module
2227
*graalpython.lib-python.3.test.test_import.__init__.ImportTests.test_from_import_message_for_nonexistent_module
2328
*graalpython.lib-python.3.test.test_import.__init__.ImportTests.test_from_import_missing_attr_has_name
29+
*graalpython.lib-python.3.test.test_import.__init__.ImportTests.test_from_import_missing_attr_has_name_and_path
2430
*graalpython.lib-python.3.test.test_import.__init__.ImportTests.test_from_import_missing_attr_has_name_and_so_path
31+
*graalpython.lib-python.3.test.test_import.__init__.ImportTests.test_from_import_missing_attr_path_is_canonical
2532
*graalpython.lib-python.3.test.test_import.__init__.ImportTests.test_from_import_missing_attr_raises_ImportError
2633
*graalpython.lib-python.3.test.test_import.__init__.ImportTests.test_from_import_missing_module_raises_ModuleNotFoundError
34+
*graalpython.lib-python.3.test.test_import.__init__.ImportTests.test_from_import_star_invalid_type
2735
*graalpython.lib-python.3.test.test_import.__init__.ImportTests.test_import
2836
*graalpython.lib-python.3.test.test_import.__init__.ImportTests.test_import_by_filename
2937
*graalpython.lib-python.3.test.test_import.__init__.ImportTests.test_import_in_del_does_not_crash
@@ -38,17 +46,22 @@
3846
*graalpython.lib-python.3.test.test_import.__init__.ImportTracebackTests.test_broken_parent_from
3947
*graalpython.lib-python.3.test.test_import.__init__.ImportTracebackTests.test_broken_submodule
4048
*graalpython.lib-python.3.test.test_import.__init__.ImportTracebackTests.test_exec_failure
49+
*graalpython.lib-python.3.test.test_import.__init__.ImportTracebackTests.test_exec_failure_nested
4150
*graalpython.lib-python.3.test.test_import.__init__.ImportTracebackTests.test_import_bug
4251
*graalpython.lib-python.3.test.test_import.__init__.ImportTracebackTests.test_nonexistent_module
52+
*graalpython.lib-python.3.test.test_import.__init__.ImportTracebackTests.test_nonexistent_module_nested
4353
*graalpython.lib-python.3.test.test_import.__init__.ImportTracebackTests.test_syntax_error
4454
*graalpython.lib-python.3.test.test_import.__init__.ImportTracebackTests.test_unencodable_filename
4555
*graalpython.lib-python.3.test.test_import.__init__.ImportlibBootstrapTests.test_frozen_importlib
4656
*graalpython.lib-python.3.test.test_import.__init__.ImportlibBootstrapTests.test_frozen_importlib_external_is_bootstrap_external
4757
*graalpython.lib-python.3.test.test_import.__init__.ImportlibBootstrapTests.test_frozen_importlib_is_bootstrap
4858
*graalpython.lib-python.3.test.test_import.__init__.ImportlibBootstrapTests.test_there_can_be_only_one
59+
*graalpython.lib-python.3.test.test_import.__init__.OverridingImportBuiltinTests.test_override_builtin
4960
*graalpython.lib-python.3.test.test_import.__init__.PathsTests.test_UNC_path
5061
*graalpython.lib-python.3.test.test_import.__init__.PathsTests.test_trailing_slash
5162
*graalpython.lib-python.3.test.test_import.__init__.PycRewritingTests.test_basics
63+
*graalpython.lib-python.3.test.test_import.__init__.PycRewritingTests.test_foreign_code
64+
*graalpython.lib-python.3.test.test_import.__init__.PycRewritingTests.test_incorrect_code_name
5265
*graalpython.lib-python.3.test.test_import.__init__.PycRewritingTests.test_module_without_source
5366
*graalpython.lib-python.3.test.test_import.__init__.PycacheTests.test___cached__
5467
*graalpython.lib-python.3.test.test_import.__init__.PycacheTests.test___cached___legacy_pyc
@@ -58,9 +71,11 @@
5871
*graalpython.lib-python.3.test.test_import.__init__.PycacheTests.test_package___cached__
5972
*graalpython.lib-python.3.test.test_import.__init__.PycacheTests.test_package___cached___from_pyc
6073
*graalpython.lib-python.3.test.test_import.__init__.PycacheTests.test_recompute_pyc_same_second
74+
*graalpython.lib-python.3.test.test_import.__init__.PycacheTests.test_unwritable_directory
6175
*graalpython.lib-python.3.test.test_import.__init__.RelativeImportTests.test_absolute_import_without_future
6276
*graalpython.lib-python.3.test.test_import.__init__.RelativeImportTests.test_import_from_non_package
6377
*graalpython.lib-python.3.test.test_import.__init__.RelativeImportTests.test_import_from_unloaded_package
6478
*graalpython.lib-python.3.test.test_import.__init__.RelativeImportTests.test_issue3221
6579
*graalpython.lib-python.3.test.test_import.__init__.RelativeImportTests.test_parentless_import_shadowed_by_global
6680
*graalpython.lib-python.3.test.test_import.__init__.RelativeImportTests.test_relimport_star
81+
*graalpython.lib-python.3.test.test_import.__init__.TestSymbolicallyLinkedPackage.test_symlinked_dir_importable

‎graalpython/com.oracle.graal.python.test/testData/goldenFiles/ImportTests/basic07.tast

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -5,20 +5,20 @@ ModuleRootNode Name: <module 'basic07'> SourceSection: [0,29]`import encodings.a
55
FrameDescriptor: Empty
66
Documentation: None
77
InnerRootNode SourceSection: [0,29]`import encodings.ali...`
8-
ExpressionWithSideEffect SourceSection: [0,29]`import encodings.ali...`
9-
Expression:
10-
EmptyNode SourceSection: None
11-
SideEffect:
12-
WriteNameNodeGen SourceSection: [7,29]`encodings.aliases as...`
8+
ExpressionWithSideEffects SourceSection: [0,29]`import encodings.ali...`
9+
ExpressionStatementNode SourceSection: None
10+
ImportExpression SourceSection: None
11+
ImportNode SourceSection: None
12+
Module: encodings.aliases
13+
ImportFromNode SourceSection: None
14+
Importee: encodings
15+
Level: 0
16+
FromList: aliases
17+
WriteNameNodeGen SourceSection: None
1318
Identifier: a
14-
GetAttributeNodeGen SourceSection: None
15-
GetFixedAttributeNodeGen SourceSection: None
16-
Key: aliases
17-
CachedDispatchFirst SourceSection: None
18-
LookupAndCallBinaryNodeGen SourceSection: None
19-
Op: __getattribute__
20-
IsBuiltinClassProfile SourceSection: None
21-
CachedDispatchFirst SourceSection: None
22-
ImportExpression SourceSection: None
23-
ImportNode SourceSection: None
24-
Module: encodings.aliases
19+
EmptyNode SourceSection: None
20+
IsBuiltinClassProfile SourceSection: None
21+
CachedDispatchFirst SourceSection: None
22+
IsBuiltinClassProfile SourceSection: None
23+
CachedDispatchFirst SourceSection: None
24+
EmptyNode SourceSection: None

‎graalpython/com.oracle.graal.python.test/testData/goldenFiles/ImportTests/basic09.tast

Lines changed: 16 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -5,28 +5,20 @@ ModuleRootNode Name: <module 'basic09'> SourceSection: [0,39]`import encodings.a
55
FrameDescriptor: Empty
66
Documentation: None
77
InnerRootNode SourceSection: [0,39]`import encodings.ali...`
8-
ExpressionWithSideEffect SourceSection: [0,39]`import encodings.ali...`
9-
Expression:
10-
EmptyNode SourceSection: None
11-
SideEffect:
12-
WriteNameNodeGen SourceSection: [7,39]`encodings.aliases.so...`
8+
ExpressionWithSideEffects SourceSection: [0,39]`import encodings.ali...`
9+
ExpressionStatementNode SourceSection: None
10+
ImportExpression SourceSection: None
11+
ImportNode SourceSection: None
12+
Module: encodings.aliases.something
13+
ImportFromNode SourceSection: None
14+
Importee: encodings.aliases
15+
Level: 0
16+
FromList: something
17+
WriteNameNodeGen SourceSection: None
1318
Identifier: a
14-
GetAttributeNodeGen SourceSection: None
15-
GetFixedAttributeNodeGen SourceSection: None
16-
Key: something
17-
CachedDispatchFirst SourceSection: None
18-
LookupAndCallBinaryNodeGen SourceSection: None
19-
Op: __getattribute__
20-
IsBuiltinClassProfile SourceSection: None
21-
CachedDispatchFirst SourceSection: None
22-
GetAttributeNodeGen SourceSection: None
23-
GetFixedAttributeNodeGen SourceSection: None
24-
Key: aliases
25-
CachedDispatchFirst SourceSection: None
26-
LookupAndCallBinaryNodeGen SourceSection: None
27-
Op: __getattribute__
28-
IsBuiltinClassProfile SourceSection: None
29-
CachedDispatchFirst SourceSection: None
30-
ImportExpression SourceSection: None
31-
ImportNode SourceSection: None
32-
Module: encodings.aliases.something
19+
EmptyNode SourceSection: None
20+
IsBuiltinClassProfile SourceSection: None
21+
CachedDispatchFirst SourceSection: None
22+
IsBuiltinClassProfile SourceSection: None
23+
CachedDispatchFirst SourceSection: None
24+
EmptyNode SourceSection: None

‎graalpython/com.oracle.graal.python.test/testData/goldenFiles/ImportTests/fromImport02.tast

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,7 @@ ModuleRootNode Name: <module 'fromImport02'> SourceSection: [0,28]`from sys.path
1616
WriteNameNodeGen SourceSection: None
1717
Identifier: dirname
1818
EmptyNode SourceSection: None
19-
GetAnyAttributeNodeGen SourceSection: None
19+
IsBuiltinClassProfile SourceSection: None
2020
CachedDispatchFirst SourceSection: None
21-
LookupAndCallBinaryNodeGen SourceSection: None
22-
Op: __getattribute__
23-
IsBuiltinClassProfile SourceSection: None
24-
CachedDispatchFirst SourceSection: None
2521
IsBuiltinClassProfile SourceSection: None
2622
CachedDispatchFirst SourceSection: None

‎graalpython/com.oracle.graal.python.test/testData/goldenFiles/ImportTests/fromImport03.tast

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,7 @@ ModuleRootNode Name: <module 'fromImport03'> SourceSection: [0,30]`from sys.path
1616
WriteNameNodeGen SourceSection: None
1717
Identifier: dirname
1818
EmptyNode SourceSection: None
19-
GetAnyAttributeNodeGen SourceSection: None
19+
IsBuiltinClassProfile SourceSection: None
2020
CachedDispatchFirst SourceSection: None
21-
LookupAndCallBinaryNodeGen SourceSection: None
22-
Op: __getattribute__
23-
IsBuiltinClassProfile SourceSection: None
24-
CachedDispatchFirst SourceSection: None
2521
IsBuiltinClassProfile SourceSection: None
2622
CachedDispatchFirst SourceSection: None

‎graalpython/com.oracle.graal.python.test/testData/goldenFiles/ImportTests/fromImport04.tast

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,7 @@ ModuleRootNode Name: <module 'fromImport04'> SourceSection: [0,31]`from sys.path
1616
WriteNameNodeGen SourceSection: None
1717
Identifier: dirname
1818
EmptyNode SourceSection: None
19-
GetAnyAttributeNodeGen SourceSection: None
19+
IsBuiltinClassProfile SourceSection: None
2020
CachedDispatchFirst SourceSection: None
21-
LookupAndCallBinaryNodeGen SourceSection: None
22-
Op: __getattribute__
23-
IsBuiltinClassProfile SourceSection: None
24-
CachedDispatchFirst SourceSection: None
2521
IsBuiltinClassProfile SourceSection: None
2622
CachedDispatchFirst SourceSection: None

‎graalpython/com.oracle.graal.python.test/testData/goldenFiles/ImportTests/fromImport05.tast

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,7 @@ ModuleRootNode Name: <module 'fromImport05'> SourceSection: [0,42]`from sys.path
1616
WriteNameNodeGen SourceSection: None
1717
Identifier: my_dirname
1818
EmptyNode SourceSection: None
19-
GetAnyAttributeNodeGen SourceSection: None
19+
IsBuiltinClassProfile SourceSection: None
2020
CachedDispatchFirst SourceSection: None
21-
LookupAndCallBinaryNodeGen SourceSection: None
22-
Op: __getattribute__
23-
IsBuiltinClassProfile SourceSection: None
24-
CachedDispatchFirst SourceSection: None
2521
IsBuiltinClassProfile SourceSection: None
2622
CachedDispatchFirst SourceSection: None

‎graalpython/com.oracle.graal.python.test/testData/goldenFiles/ImportTests/fromImport06.tast

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,7 @@ ModuleRootNode Name: <module 'fromImport06'> SourceSection: [0,44]`from sys.path
1616
WriteNameNodeGen SourceSection: None
1717
Identifier: my_dirname
1818
EmptyNode SourceSection: None
19-
GetAnyAttributeNodeGen SourceSection: None
19+
IsBuiltinClassProfile SourceSection: None
2020
CachedDispatchFirst SourceSection: None
21-
LookupAndCallBinaryNodeGen SourceSection: None
22-
Op: __getattribute__
23-
IsBuiltinClassProfile SourceSection: None
24-
CachedDispatchFirst SourceSection: None
2521
IsBuiltinClassProfile SourceSection: None
2622
CachedDispatchFirst SourceSection: None

‎graalpython/com.oracle.graal.python.test/testData/goldenFiles/ImportTests/fromImport07.tast

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,7 @@ ModuleRootNode Name: <module 'fromImport07'> SourceSection: [0,45]`from sys.path
1616
WriteNameNodeGen SourceSection: None
1717
Identifier: my_dirname
1818
EmptyNode SourceSection: None
19-
GetAnyAttributeNodeGen SourceSection: None
19+
IsBuiltinClassProfile SourceSection: None
2020
CachedDispatchFirst SourceSection: None
21-
LookupAndCallBinaryNodeGen SourceSection: None
22-
Op: __getattribute__
23-
IsBuiltinClassProfile SourceSection: None
24-
CachedDispatchFirst SourceSection: None
2521
IsBuiltinClassProfile SourceSection: None
2622
CachedDispatchFirst SourceSection: None

‎graalpython/com.oracle.graal.python.test/testData/goldenFiles/ImportTests/fromImport08.tast

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,7 @@ ModuleRootNode Name: <module 'fromImport08'> SourceSection: [0,38]`from sys.path
1919
WriteNameNodeGen SourceSection: None
2020
Identifier: basename
2121
EmptyNode SourceSection: None
22-
GetAnyAttributeNodeGen SourceSection: None
22+
IsBuiltinClassProfile SourceSection: None
2323
CachedDispatchFirst SourceSection: None
24-
LookupAndCallBinaryNodeGen SourceSection: None
25-
Op: __getattribute__
26-
IsBuiltinClassProfile SourceSection: None
27-
CachedDispatchFirst SourceSection: None
2824
IsBuiltinClassProfile SourceSection: None
2925
CachedDispatchFirst SourceSection: None

0 commit comments

Comments
 (0)