Merge pull request swiftlang#238 from swiftwasm/main

[pull] swiftwasm from main

Author: pull[bot]

DarwinCompatibilityTests.xcodeproj/xcshareddata/xcschemes/xdgTestHelper.xcscheme

@@ -59,9 +59,6 @@
                <Test
                   Identifier = "TestURLRequest/test_hash()">
                </Test>
-               <Test
-                  Identifier = "TestURLSession">
-               </Test>
                <Test
                   Identifier = "TestXMLDocument/test_creatingAnEmptyDocumentAndNode()">
                </Test>

Tests/Foundation/Tests/TestNSString.swift

@@ -814,7 +814,8 @@ class TestNSString: LoopbackServerTest {
     }
 
     func test_initializeWithFormat4() {
-        let argument: [CVarArg] = ["One", "Two", "Three"]
+        // The NSString() is required on macOS to work around error: `Type of expression is ambiguous without more context`
+        let argument: [CVarArg] = [NSString("One"), NSString("Two"), NSString("Three")]
         withVaList(argument) {
             pointer in
             let string = NSString(format: "Testing %@ %@ %@", arguments: pointer)

Tests/Foundation/Tests/TestURLSession.swift

@@ -1794,15 +1794,15 @@ class TestURLSession: LoopbackServerTest {
             ("test_httpRedirectionChainInheritsTimeoutInterval", test_httpRedirectionChainInheritsTimeoutInterval),
             ("test_httpRedirectionExceededMaxRedirects", test_httpRedirectionExceededMaxRedirects),
             ("test_httpNotFound", test_httpNotFound),
-            ("test_http0_9SimpleResponses", test_http0_9SimpleResponses),
+            /* ⚠️ */ ("test_http0_9SimpleResponses", testExpectedToFail(test_http0_9SimpleResponses, "Breaks on Ubunut20.04")),
             ("test_outOfRangeButCorrectlyFormattedHTTPCode", test_outOfRangeButCorrectlyFormattedHTTPCode),
             ("test_missingContentLengthButStillABody", test_missingContentLengthButStillABody),
             ("test_illegalHTTPServerResponses", test_illegalHTTPServerResponses),
             ("test_dataTaskWithSharedDelegate", test_dataTaskWithSharedDelegate),
             ("test_simpleUploadWithDelegate", test_simpleUploadWithDelegate),
             ("test_requestWithEmptyBody", test_requestWithEmptyBody),
             ("test_requestWithNonEmptyBody", test_requestWithNonEmptyBody),
-            ("test_concurrentRequests", test_concurrentRequests),
+            /* ⚠️ */ ("test_concurrentRequests", testExpectedToFail(test_concurrentRequests, "Fails about 4% of the time")),
             ("test_disableCookiesStorage", test_disableCookiesStorage),
             ("test_cookiesStorage", test_cookiesStorage),
             ("test_cookieStorageForEphemeralConfiguration", test_cookieStorageForEphemeralConfiguration),
@@ -1816,15 +1816,15 @@ class TestURLSession: LoopbackServerTest {
             ("test_checkErrorTypeAfterInvalidateAndCancel", test_checkErrorTypeAfterInvalidateAndCancel),
             ("test_taskCountAfterInvalidateAndCancel", test_taskCountAfterInvalidateAndCancel),
             ("test_sessionDelegateAfterInvalidateAndCancel", test_sessionDelegateAfterInvalidateAndCancel),
-            ("test_getAllTasks", test_getAllTasks),
+            /* ⚠️ */ ("test_getAllTasks", testExpectedToFail(test_getAllTasks, "This test causes later ones to crash")),
             ("test_getTasksWithCompletion", test_getTasksWithCompletion),
             /* ⚠️ */ ("test_invalidResumeDataForDownloadTask",
             /* ⚠️ */   testExpectedToFail(test_invalidResumeDataForDownloadTask, "This test crashes nondeterministically: https://bugs.swift.org/browse/SR-11353")),
             /* ⚠️ */ ("test_simpleUploadWithDelegateProvidingInputStream",
             /* ⚠️ */   testExpectedToFail(test_simpleUploadWithDelegateProvidingInputStream, "This test times out frequently: https://bugs.swift.org/browse/SR-11343")),
             /* ⚠️ */ ("test_noDoubleCallbackWhenCancellingAndProtocolFailsFast",
             /* ⚠️ */      testExpectedToFail(test_noDoubleCallbackWhenCancellingAndProtocolFailsFast, "This test crashes nondeterministically: https://bugs.swift.org/browse/SR-11310")),
-            ("test_cancelledTasksCannotBeResumed", test_cancelledTasksCannotBeResumed),
+            /* ⚠️ */ ("test_cancelledTasksCannotBeResumed", testExpectedToFail(test_cancelledTasksCannotBeResumed, "Breaks on Ubuntu 18.04")),
         ]
     }
 

Tests/Foundation/main.swift

@@ -98,7 +98,6 @@ var allTestCases = [
     testCase(TestURLRequest.allTests),
     testCase(TestURLResponse.allTests),
     testCase(TestHTTPURLResponse.allTests),
-    testCaseExpectedToFail(TestURLSession.allTests, "URLSession test interdependencies are causing intermittent CI issues."),
     testCase(TestNSUUID.allTests),
     testCase(TestUUID.allTests),
     testCase(TestNSValue.allTests),
@@ -127,6 +126,7 @@ var allTestCases = [
 
 #if !os(Windows)
 allTestCases.append(contentsOf: [
+    testCase(TestURLSession.allTests),
     testCase(TestURLSessionFTP.allTests),
 ])
 #endif