@@ -62,13 +62,13 @@ final class PackageToolTests: XCTestCase {
62
62
// file at correct location
63
63
try execute ( [ " --netrc-file " , netrcPath. pathString, " resolve " ] , packagePath: packageRoot)
64
64
// file does not exist, but is optional
65
- let textOutput = try execute ( [ " --netrc-file " , " /foo " , " --netrc-optional " , " resolve " ] , packagePath: packageRoot) . stderr
66
- XCTAssertMatch ( textOutput, . contains( " warning: Did not find optional .netrc file at /foo. " ) )
65
+ let textOutput = try execute ( [ " --netrc-file " , " /foo " , " resolve " ] , packagePath: packageRoot) . stderr
66
+ XCTAssertMatch ( textOutput, . contains( " warning: Did not find .netrc file at /foo. " ) )
67
67
68
68
// required file does not exist, will throw
69
69
try execute ( [ " --netrc-file " , " /foo " , " resolve " ] , packagePath: packageRoot)
70
70
} catch {
71
- XCTAssertMatch ( String ( describing: error) , . contains( " Cannot find mandatory .netrc file at /foo" ) )
71
+ XCTAssertMatch ( String ( describing: error) , . contains( " Did not find .netrc file at /foo. " ) )
72
72
}
73
73
}
74
74
@@ -79,18 +79,18 @@ final class PackageToolTests: XCTestCase {
79
79
try execute ( [ " --netrc " , " resolve " ] , packagePath: packageRoot)
80
80
} else {
81
81
// file does not exist, but is optional
82
- let textOutput = try execute ( [ " --netrc " , " --netrc-optional " , " resolve " ] , packagePath: packageRoot)
83
- XCTAssertMatch ( textOutput. stderr, . contains( " Did not find optional .netrc file at \( localFileSystem. homeDirectory) /.netrc. " ) )
82
+ let textOutput = try execute ( [ " --netrc " , " resolve " ] , packagePath: packageRoot)
83
+ XCTAssertMatch ( textOutput. stderr, . contains( " Did not find .netrc file at \( localFileSystem. homeDirectory) /.netrc. " ) )
84
84
85
85
// file does not exist, but is optional
86
86
let textOutput2 = try execute ( [ " --netrc-optional " , " resolve " ] , packagePath: packageRoot)
87
- XCTAssertMatch ( textOutput2. stderr, . contains( " Did not find optional .netrc file at \( localFileSystem. homeDirectory) /.netrc. " ) )
87
+ XCTAssertMatch ( textOutput2. stderr, . contains( " Did not find .netrc file at \( localFileSystem. homeDirectory) /.netrc. " ) )
88
88
89
89
// required file does not exist, will throw
90
90
try execute ( [ " --netrc " , " resolve " ] , packagePath: packageRoot)
91
91
}
92
92
} catch {
93
- XCTAssertMatch ( String ( describing: error) , . contains( " Cannot find mandatory .netrc file at \( localFileSystem. homeDirectory) /.netrc " ) )
93
+ XCTAssertMatch ( String ( describing: error) , . contains( " Did not find .netrc file at \( localFileSystem. homeDirectory) /.netrc " ) )
94
94
}
95
95
}
96
96
}
0 commit comments