Skip to content

Build Fix: TestURL #2158

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Apr 23, 2019
Merged

Build Fix: TestURL #2158

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bbd5283
macOS Build fix: TestURL
millenomi Apr 22, 2019
0a5d278
XFAIL TestURL while we root cause this.
millenomi Apr 23, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 12 additions & 12 deletions TestFoundation/TestURL.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -244,29 +244,29 @@ class TestURL : XCTestCase {

do {
try FileManager.default.removeItem(atPath: gFileDoesNotExistPath)
} catch let error as NSError {
} catch {
// The error code is a CocoaError
if error.code != CocoaError.fileNoSuchFile.rawValue {
if (error as? NSError)?.code != CocoaError.fileNoSuchFile.rawValue {
return false
}
}

do {
try FileManager.default.createDirectory(atPath: gDirectoryExistsPath, withIntermediateDirectories: false)
} catch let error as NSError {
// The error code is a CocoaError
if error.code != CocoaError.fileWriteFileExists.rawValue {
return false
}
} catch {
// The error code is a CocoaError
if (error as? NSError)?.code != CocoaError.fileNoSuchFile.rawValue {
return false
}
}

do {
try FileManager.default.removeItem(atPath: gDirectoryDoesNotExistPath)
} catch let error as NSError {
// The error code is a CocoaError
if error.code != CocoaError.fileNoSuchFile.rawValue {
return false
}
} catch {
// The error code is a CocoaError
if (error as? NSError)?.code != CocoaError.fileNoSuchFile.rawValue {
return false
}
}

#if os(Android)
Expand Down
6 changes: 6 additions & 0 deletions TestFoundation/Utilities.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -456,6 +456,12 @@ func shouldAttemptXFailTests(_ reason: String) -> Bool {
}
}

func appendTestCaseExpectedToFail<T: XCTestCase>(_ reason: String, _ allTests: [(String, (T) -> () throws -> Void)], into array: inout [XCTestCaseEntry]) {
if shouldAttemptXFailTests(reason) {
array.append(testCase(allTests))
}
}

func testExpectedToFail<T>(_ test: @escaping (T) -> () throws -> Void, _ reason: String) -> (T) -> () throws -> Void {
if shouldAttemptXFailTests(reason) {
return test
Expand Down
12 changes: 9 additions & 3 deletions TestFoundation/main.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ _ = signal(SIGPIPE, SIG_IGN)
#endif

// For the Swift version of the Foundation tests, we must manually list all test cases here.
XCTMain([
var allTestCases = [
testCase(TestAffineTransform.allTests),
testCase(TestNSArray.allTests),
testCase(TestBundle.allTests),
Expand Down Expand Up @@ -80,7 +80,7 @@ XCTMain([
testCase(TestNSTextCheckingResult.allTests),
testCase(TestTimer.allTests),
testCase(TestTimeZone.allTests),
testCase(TestURL.allTests),
/* ⚠️ */ // testCase(TestURL.allTests),
testCase(TestURLComponents.allTests),
testCase(TestURLCredential.allTests),
testCase(TestURLProtectionSpace.allTests),
Expand Down Expand Up @@ -112,4 +112,10 @@ XCTMain([
testCase(TestDimension.allTests),
testCase(TestMeasurement.allTests),
testCase(TestNSLock.allTests),
])
]

appendTestCaseExpectedToFail("TestURL is not deleting its temporary directory correctly. https://bugs.swift.org/browse/SR-10538",
TestURL.allTests,
into: &allTestCases)

XCTMain(allTestCases)