[GR-21590] Update imports

msimacek · msimacek · commit 1446e1fb7cf8 · 2020-05-26T10:40:25.000Z
PullRequest: graalpython/972
diff --git a/ci.jsonnet b/ci.jsonnet
@@ -1 +1 @@
-{ "overlay": "9f88a237b49801c25c4633e22d9a95c38032f9f2" }
+{ "overlay": "342d54c7c779683771fd346ae919235334523e58" }
diff --git a/graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_asyncore.txt b/graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_asyncore.txt
@@ -6,5 +6,6 @@
 *DispatcherTests.test_unhandled
 *HelperFunctionTests.test_closeall
 *HelperFunctionTests.test_closeall_default
+*HelperFunctionTests.test_compact_traceback
 *HelperFunctionTests.test_readwrite
 *HelperFunctionTests.test_readwriteexc
diff --git a/graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_augassign.txt b/graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_augassign.txt
@@ -0,0 +1,7 @@
+*AugAssignTest.testBasic
+*AugAssignTest.testCustomMethods1
+*AugAssignTest.testCustomMethods2
+*AugAssignTest.testInDict
+*AugAssignTest.testInList
+*AugAssignTest.testSequences
+*AugAssignTest.test_with_unpacking
diff --git a/graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_collections.txt b/graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_collections.txt
@@ -8,6 +8,7 @@
 *TestCollectionABCs.test_ByteString
 *TestCollectionABCs.test_MutableMapping_subclass
 *TestCollectionABCs.test_MutableSequence_mixins
+*TestCollectionABCs.test_Sequence_mixins
 *TestCollectionABCs.test_arithmetic_Set
 *TestCollectionABCs.test_equality_Set
 *TestCollectionABCs.test_hash_Set
diff --git a/graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_configparser.txt b/graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_configparser.txt
@@ -30,6 +30,11 @@
 *CoverageOneHundredTestCase.test_readfp_deprecation
 *CoverageOneHundredTestCase.test_safeconfigparser_deprecation
 *CoverageOneHundredTestCase.test_sectionproxy_repr
+*ExceptionContextTestCase.test_get_basic_interpolation
+*ExceptionContextTestCase.test_get_extended_interpolation
+*ExceptionContextTestCase.test_missing_options
+*ExceptionContextTestCase.test_missing_section
+*ExceptionContextTestCase.test_remove_option
 *InlineCommentStrippingTestCase.test_stripping
 *Issue7005TestCase.test_none_as_value_stringified
 *Issue7005TestCase.test_none_as_value_stringified_raw
diff --git a/graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_contextlib.txt b/graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_contextlib.txt
@@ -7,6 +7,7 @@
 *ContextManagerTestCase.test_contextmanager_except
 *ContextManagerTestCase.test_contextmanager_except_stopiter
 *ContextManagerTestCase.test_contextmanager_finally
+*ContextManagerTestCase.test_contextmanager_no_reraise
 *ContextManagerTestCase.test_contextmanager_plain
 *ContextManagerTestCase.test_contextmanager_trap_yield_after_throw
 *ContextManagerTestCase.test_instance_docstring_given_cm_docstring
@@ -31,3 +32,12 @@
 *TestContextDecorator.test_instance_docs
 *TestContextDecorator.test_typo_enter
 *TestContextDecorator.test_typo_exit
+*TestSuppress.test_cm_is_reentrant
+*TestSuppress.test_exact_exception
+*TestSuppress.test_exception_hierarchy
+*TestSuppress.test_instance_docs
+*TestSuppress.test_multiple_exception_args
+*TestSuppress.test_no_args
+*TestSuppress.test_no_exception
+*TestSuppress.test_no_result_from_enter
+*TestSuppress.test_other_exception
diff --git a/graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_decimal.txt b/graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_decimal.txt
@@ -1 +1,2 @@
+*ContextAPItests.test_from_legacy_strings
 *ExplicitConstructionTest.test_from_legacy_strings
diff --git a/graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_exceptions.txt b/graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_exceptions.txt
@@ -1 +1,6 @@
 *ExceptionTests.testChainingAttrs
+*ExceptionTests.testChainingDescriptors
+*ExceptionTests.testExceptionCleanupNames
+*ExceptionTests.testInvalidTraceback
+*ExceptionTests.testKeywordArgs
+*ExceptionTests.testNoneClearsTracebackAttr
diff --git a/graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_frame.txt b/graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_frame.txt
@@ -1 +1,3 @@
 *ClearTest.test_clear_refcycles
+*FrameAttrsTest.test_f_lineno_del_segfault
+*FrameAttrsTest.test_locals
diff --git a/graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_funcattrs.txt b/graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_funcattrs.txt
@@ -1,3 +1,13 @@
+*ArbitraryFunctionAttrTest.test_delete_unknown_attr
+*ArbitraryFunctionAttrTest.test_unset_attr
+*FunctionDictsTest.test_func_as_dict_key
 *FunctionPropertiesTest.test___closure__
 *FunctionPropertiesTest.test___code__
 *FunctionPropertiesTest.test___globals__
+*FunctionPropertiesTest.test_copying___code__
+*FunctionPropertiesTest.test_dir_includes_correct_attrs
+*FunctionPropertiesTest.test_duplicate_function_equality
+*FunctionPropertiesTest.test_empty_cell
+*FunctionPropertiesTest.test_module
+*InstancemethodAttrTest.test___func__
+*InstancemethodAttrTest.test___self__
diff --git a/graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_generators.txt b/graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_generators.txt
@@ -1,3 +1,4 @@
+*ExceptionTest.test_except_gen_except
 *ExceptionTest.test_except_next
 *ExceptionTest.test_except_throw
 *ExceptionTest.test_return_stopiteration
diff --git a/graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_htmlparser.txt b/graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_htmlparser.txt
@@ -3,6 +3,8 @@
 *AttributesTestCase.test_attr_funky_names
 *AttributesTestCase.test_attr_funky_names2
 *AttributesTestCase.test_attr_nonascii
+*AttributesTestCase.test_attr_syntax
+*AttributesTestCase.test_attr_values
 *AttributesTestCase.test_end_tag_in_attribute_value
 *AttributesTestCase.test_entities_in_attribute_value
 *AttributesTestCase.test_entityrefs_in_attributes
@@ -18,20 +20,26 @@
 *HTMLParserTestCase.test_broken_condcoms
 *HTMLParserTestCase.test_broken_invalid_end_tag
 *HTMLParserTestCase.test_buffer_artefacts
+*HTMLParserTestCase.test_cdata_content
+*HTMLParserTestCase.test_cdata_with_closing_tags
 *HTMLParserTestCase.test_comma_between_attributes
 *HTMLParserTestCase.test_comments
 *HTMLParserTestCase.test_condcoms
 *HTMLParserTestCase.test_convert_charrefs
 *HTMLParserTestCase.test_convert_charrefs_dropped_text
 *HTMLParserTestCase.test_correct_detection_of_start_tags
 *HTMLParserTestCase.test_declaration_junk_chars
+*HTMLParserTestCase.test_get_starttag_text
 *HTMLParserTestCase.test_illegal_declarations
+*HTMLParserTestCase.test_invalid_end_tags
 *HTMLParserTestCase.test_malformatted_charref
 *HTMLParserTestCase.test_processing_instruction_only
+*HTMLParserTestCase.test_simple_html
 *HTMLParserTestCase.test_slashes_in_starttag
 *HTMLParserTestCase.test_startendtag
 *HTMLParserTestCase.test_starttag_end_boundary
 *HTMLParserTestCase.test_starttag_junk_chars
+*HTMLParserTestCase.test_tolerant_parsing
 *HTMLParserTestCase.test_unclosed_entityref
 *HTMLParserTestCase.test_unescape_method
 *HTMLParserTestCase.test_valid_doctypes
diff --git a/graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_iter.txt b/graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_iter.txt
@@ -33,3 +33,4 @@
 *TestCase.test_sinkstate_yield
 *TestCase.test_stop_sequence
 *TestCase.test_unicode_join_endcase
+*TestCase.test_writelines
diff --git a/graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_math.txt b/graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_math.txt
@@ -1,3 +1,14 @@
+*IsCloseTests.test_asymmetry
+*IsCloseTests.test_decimals
+*IsCloseTests.test_eight_decimal_places
+*IsCloseTests.test_fractions
+*IsCloseTests.test_identical
+*IsCloseTests.test_identical_infinite
+*IsCloseTests.test_inf_ninf_nan
+*IsCloseTests.test_integers
+*IsCloseTests.test_near_zero
+*IsCloseTests.test_negative_tolerances
+*IsCloseTests.test_zero_tolerance
 *MathTests.testAcos
 *MathTests.testAcosh
 *MathTests.testAsin
@@ -24,3 +35,22 @@
 *MathTests.testIsfinite
 *MathTests.testIsinf
 *MathTests.testIsnan
+*MathTests.testLdexp
+*MathTests.testLog
+*MathTests.testLog10
+*MathTests.testLog1p
+*MathTests.testLog2
+*MathTests.testLog2Exact
+*MathTests.testModf
+*MathTests.testPow
+*MathTests.testRadians
+*MathTests.testSin
+*MathTests.testSinh
+*MathTests.testSqrt
+*MathTests.testTan
+*MathTests.testTanh
+*MathTests.testTanhSign
+*MathTests.test_exceptions
+*MathTests.test_inf_constant
+*MathTests.test_nan_constant
+*MathTests.test_trunc
diff --git a/graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_pow.txt b/graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_pow.txt
@@ -1 +1,2 @@
+*PowTest.test_bug643260
 *PowTest.test_bug705231
diff --git a/graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_raise.txt b/graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_raise.txt
@@ -1,8 +1,29 @@
+*TestCause.testCauseSyntax
+*TestCause.test_class_cause
+*TestCause.test_instance_cause
+*TestCause.test_invalid_cause
+*TestContext.test_3118
+*TestContext.test_c_exception_context
+*TestContext.test_c_exception_raise
+*TestContext.test_class_context_class_raise
+*TestContext.test_class_context_instance_raise
+*TestContext.test_context_manager
+*TestContext.test_cycle_broken
+*TestContext.test_instance_context_instance_raise
+*TestContext.test_noraise_finally
+*TestContext.test_raise_finally
+*TestContext.test_reraise_cycle_broken
 *TestRaise.test_assert_with_tuple_arg
 *TestRaise.test_except_reraise
 *TestRaise.test_finally_reraise
 *TestRaise.test_invalid_reraise
 *TestRaise.test_nested_reraise
+*TestRaise.test_raise_from_None
 *TestRaise.test_reraise
 *TestRaise.test_with_reraise1
 *TestRaise.test_with_reraise2
+*TestRaise.test_yield_reraise
+*TestRemovedFunctionality.test_strings
+*TestRemovedFunctionality.test_tuples
+*TestTraceback.test_accepts_traceback
+*TestTraceback.test_sets_traceback
diff --git a/graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_signal.txt b/graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_signal.txt
@@ -1,4 +1,5 @@
 *GenericTests.test_enums
+*PosixTests.test_setting_signal_handler_to_none_raises_error
 *WakeupSignalTests.test_pending
 *WakeupSignalTests.test_signum
 *WakeupSignalTests.test_wakeup_fd_during
diff --git a/graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_smtpd.txt b/graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_smtpd.txt
@@ -0,0 +1,3 @@
+*MiscTestCase.test__all__
+*SMTPDServerTest.test_decode_data_and_enable_SMTPUTF8_raises
+*TestFamilyDetection.test_socket_uses_IPv6
diff --git a/graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_smtplib.txt b/graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_smtplib.txt
@@ -0,0 +1,8 @@
+*GeneralTests.testBasic1
+*GeneralTests.testBasic2
+*GeneralTests.testLocalHostName
+*GeneralTests.testQuoteData
+*GeneralTests.testSourceAddress
+*GeneralTests.testTimeoutDefault
+*GeneralTests.testTimeoutNone
+*GeneralTests.testTimeoutValue
diff --git a/graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_socket.txt b/graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_socket.txt
@@ -10,10 +10,12 @@
 *GeneralModuleTests.testInvalidInterfaceIndexToName
 *GeneralModuleTests.testInvalidInterfaceNameToIndex
 *GeneralModuleTests.testNewAttributes
+*GeneralModuleTests.testNtoHErrors
 *GeneralModuleTests.testRefCountGetNameInfo
 *GeneralModuleTests.testSendAfterClose
 *GeneralModuleTests.testSetSockOpt
 *GeneralModuleTests.testSockName
+*GeneralModuleTests.testSocketError
 *GeneralModuleTests.testStringToIPv6
 *GeneralModuleTests.testWindowsSpecificConstants
 *GeneralModuleTests.test_SocketType_is_socketobject
@@ -29,6 +31,7 @@
 *GeneralModuleTests.test_host_resolution
 *GeneralModuleTests.test_host_resolution_bad_address
 *GeneralModuleTests.test_listen_backlog
+*GeneralModuleTests.test_listen_backlog_overflow
 *GeneralModuleTests.test_makefile_invalid_mode
 *GeneralModuleTests.test_makefile_mode
 *GeneralModuleTests.test_pickle
diff --git a/graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_strptime.txt b/graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_strptime.txt
@@ -24,6 +24,7 @@
 *StrptimeTests.test_offset
 *StrptimeTests.test_percent
 *StrptimeTests.test_second
+*StrptimeTests.test_strptime_exception_context
 *StrptimeTests.test_time
 *StrptimeTests.test_unconverteddata
 *StrptimeTests.test_year
diff --git a/graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_zipimport.txt b/graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_zipimport.txt
@@ -21,4 +21,5 @@
 *UncompressedZipImportTestCase.testImport_WithStuff
 *UncompressedZipImportTestCase.testLargestPossibleComment
 *UncompressedZipImportTestCase.testPy
+*UncompressedZipImportTestCase.testTraceback
 *UncompressedZipImportTestCase.testUnencodable
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/PosixModuleBuiltins.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/PosixModuleBuiltins.java
@@ -82,6 +82,9 @@
 import java.util.Set;
 import java.util.concurrent.TimeUnit;
 
+import org.graalvm.nativeimage.ImageInfo;
+import org.graalvm.nativeimage.ProcessProperties;
+
 import com.oracle.graal.python.PythonLanguage;
 import com.oracle.graal.python.builtins.Builtin;
 import com.oracle.graal.python.builtins.CoreFunctions;
@@ -414,11 +417,21 @@ PNone chdirPath(VirtualFrame frame, Object path,
     @Builtin(name = "getpid", minNumOfPositionalArgs = 0)
     @GenerateNodeFactory
     public abstract static class GetPidNode extends PythonBuiltinNode {
+        @Specialization(rewriteOn = Exception.class)
+        @TruffleBoundary
+        long getPid() throws Exception {
+            if (ImageInfo.inImageRuntimeCode()) {
+                return ProcessProperties.getProcessID();
+            }
+            TruffleFile statFile = getContext().getPublicTruffleFileRelaxed("/proc/self/stat");
+            return Long.parseLong(new String(statFile.readAllBytes()).trim().split(" ")[0]);
+        }
+
         @Specialization
-        int getPid() {
-            // TODO: this needs to be implemented properly at some point (consider managed execution
-            // as well)
-            return System.identityHashCode(getContext());
+        @TruffleBoundary
+        long getPidFallback() {
+            String info = java.lang.management.ManagementFactory.getRuntimeMXBean().getName();
+            return Long.parseLong(info.split("@")[0]);
         }
     }
 
diff --git a/mx.graalpython/native-image.properties b/mx.graalpython/native-image.properties
@@ -5,7 +5,7 @@ Requires = language:regex language:llvm
 
 JavaArgs = -Xmx4G -Dpolyglot.image-build-time.PreinitializeContexts=python
 
-Args = -H:MaxRuntimeCompileMethods=7250 \
+Args = -H:MaxRuntimeCompileMethods=7500 \
        -H:+AddAllCharsets \
        --initialize-at-build-time=com.oracle.graal.python,com.oracle.truffle.regex,org.antlr.v4,jline,org.fusesource \
        -H:SubstitutionResources=com/oracle/graal/python/aot/substitutions.json
diff --git a/mx.graalpython/suite.py b/mx.graalpython/suite.py
@@ -44,23 +44,23 @@
             },
             {
                 "name": "tools",
-                "version": "8fb8fc502411b3c84308ff5cda4d6c1f775f3920",
+                "version": "16810c92d8bef5dcd2c81c80d3cb1c624e717cf7",
                 "subdir": True,
                 "urls": [
                     {"url": "https://github.com/oracle/graal", "kind": "git"},
                 ],
             },
             {
                 "name": "sulong",
-                "version": "8fb8fc502411b3c84308ff5cda4d6c1f775f3920",
+                "version": "16810c92d8bef5dcd2c81c80d3cb1c624e717cf7",
                 "subdir": True,
                 "urls": [
                     {"url": "https://github.com/oracle/graal", "kind": "git"},
                 ]
             },
             {
                 "name": "regex",
-                "version": "8fb8fc502411b3c84308ff5cda4d6c1f775f3920",
+                "version": "16810c92d8bef5dcd2c81c80d3cb1c624e717cf7",
                 "subdir": True,
                 "urls": [
                     {"url": "https://github.com/oracle/graal", "kind": "git"},

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-{ "overlay": "9f88a237b49801c25c4633e22d9a95c38032f9f2" }`
	`1`	`+{ "overlay": "342d54c7c779683771fd346ae919235334523e58" }`
Original file line number	Diff line number	Diff line change
`@@ -1 +1,2 @@`
	`1`	`+*ContextAPItests.test_from_legacy_strings`
`1`	`2`	`*ExplicitConstructionTest.test_from_legacy_strings`
Original file line number	Diff line number	Diff line change
`@@ -1 +1,3 @@`
`1`	`1`	`*ClearTest.test_clear_refcycles`
	`2`	`+*FrameAttrsTest.test_f_lineno_del_segfault`
	`3`	`+*FrameAttrsTest.test_locals`