Skip to content

Commit f9fae48

Browse files
authored
Home directory for non-existent user should not fall back to /var/empty or %ALLUSERSPROFILE% (#5142) (#5145)
1 parent e22cb7f commit f9fae48

File tree

2 files changed

+5
-11
lines changed

2 files changed

+5
-11
lines changed

Tests/Foundation/TestFileManager.swift

+4-6
Original file line numberDiff line numberDiff line change
@@ -929,8 +929,8 @@ class TestFileManager : XCTestCase {
929929

930930
func test_homedirectoryForUser() {
931931
let filemanger = FileManager.default
932-
XCTAssertNotNil(filemanger.homeDirectory(forUser: "someuser"))
933-
XCTAssertNotNil(filemanger.homeDirectory(forUser: ""))
932+
XCTAssertNil(filemanger.homeDirectory(forUser: "someuser"))
933+
XCTAssertNil(filemanger.homeDirectory(forUser: ""))
934934
XCTAssertNotNil(filemanger.homeDirectoryForCurrentUser)
935935
}
936936

@@ -1268,15 +1268,13 @@ class TestFileManager : XCTestCase {
12681268
let fm = FileManager.default
12691269

12701270
#if os(Windows)
1271-
let defaultHomeDirectory = ProcessInfo.processInfo.environment["ALLUSERSPROFILE"]!
12721271
let emptyFileNameError: CocoaError.Code? = .fileReadInvalidFileName
12731272
#else
1274-
let defaultHomeDirectory = "/var/empty"
12751273
let emptyFileNameError: CocoaError.Code? = nil
12761274
#endif
12771275

1278-
XCTAssertEqual(fm.homeDirectory(forUser: ""), URL(filePath: defaultHomeDirectory, directoryHint: .isDirectory))
1279-
XCTAssertEqual(NSHomeDirectoryForUser(""), defaultHomeDirectory)
1276+
XCTAssertNil(fm.homeDirectory(forUser: ""))
1277+
XCTAssertNil(NSHomeDirectoryForUser(""))
12801278

12811279
XCTAssertThrowsError(try fm.contentsOfDirectory(atPath: "")) {
12821280
let code = ($0 as? CocoaError)?.code

Tests/Foundation/TestNSString.swift

+1-5
Original file line numberDiff line numberDiff line change
@@ -1047,11 +1047,7 @@ class TestNSString: LoopbackServerTest {
10471047
let path = NSString(string: "~\(userName)/")
10481048
let result = path.expandingTildeInPath
10491049
// next assert fails in VirtualBox because home directory for unknown user resolved to /var/run/vboxadd
1050-
#if os(Windows)
1051-
XCTAssertEqual(result, ProcessInfo.processInfo.environment["ALLUSERSPROFILE"])
1052-
#else
1053-
XCTAssertEqual(result, "/var/empty", "Return copy of receiver if home directory could not be resolved.")
1054-
#endif
1050+
XCTAssertEqual(result, "~\(userName)", "Return copy of receiver if home directory could not be resolved.")
10551051
}
10561052
}
10571053

0 commit comments

Comments
 (0)