@@ -23,7 +23,7 @@ final class PackageCollectionsTests: XCTestCase {
23
23
let authTokens = ThreadSafeKeyValueStore < AuthTokenType , String > ( )
24
24
let configuration = PackageCollections . Configuration ( authTokens: { authTokens. get ( ) } )
25
25
26
- // This test doesn't use storage at all and finishes quickly so disable target trie to prevent race
26
+ // This test doesn't use search at all and finishes quickly so disable target trie to prevent race
27
27
let storageConfig = SQLitePackageCollectionsStorage . Configuration ( initializeTargetTrie: false )
28
28
let storage = makeMockStorage ( storageConfig)
29
29
defer { XCTAssertNoThrow ( try storage. close ( ) ) }
@@ -156,7 +156,9 @@ final class PackageCollectionsTests: XCTestCase {
156
156
try skipIfUnsupportedPlatform ( )
157
157
158
158
let configuration = PackageCollections . Configuration ( )
159
- let storage = makeMockStorage ( )
159
+ // This test doesn't use search at all and finishes quickly so disable target trie to prevent race
160
+ let storageConfig = SQLitePackageCollectionsStorage . Configuration ( initializeTargetTrie: false )
161
+ let storage = makeMockStorage ( storageConfig)
160
162
defer { XCTAssertNoThrow ( try storage. close ( ) ) }
161
163
162
164
let mockCollection = makeMockCollections ( count: 1 ) . first!
@@ -174,7 +176,8 @@ final class PackageCollectionsTests: XCTestCase {
174
176
}
175
177
176
178
// add fails because collection is not found
177
- guard case . failure = tsc_await ( { callback in packageCollections. addCollection ( mockCollection. source, order: nil , callback: callback) } ) else {
179
+ guard case . failure( let error) = tsc_await ( { callback in packageCollections. addCollection ( mockCollection. source, order: nil , callback: callback) } ) ,
180
+ error is NotFoundError else {
178
181
return XCTFail ( " expected error " )
179
182
}
180
183
@@ -191,7 +194,9 @@ final class PackageCollectionsTests: XCTestCase {
191
194
try skipIfUnsupportedPlatform ( )
192
195
193
196
let configuration = PackageCollections . Configuration ( )
194
- let storage = makeMockStorage ( )
197
+ // This test doesn't use search at all and finishes quickly so disable target trie to prevent race
198
+ let storageConfig = SQLitePackageCollectionsStorage . Configuration ( initializeTargetTrie: false )
199
+ let storage = makeMockStorage ( storageConfig)
195
200
defer { XCTAssertNoThrow ( try storage. close ( ) ) }
196
201
197
202
let mockCollection = makeMockCollections ( count: 1 , signed: false ) . first!
@@ -208,7 +213,9 @@ final class PackageCollectionsTests: XCTestCase {
208
213
XCTAssertEqual ( sources. count, 0 , " sources should be empty " )
209
214
}
210
215
211
- guard case . failure = tsc_await ( { callback in packageCollections. addCollection ( mockCollection. source, order: nil , callback: callback) } ) else {
216
+ // add fails because collection requires trust confirmation
217
+ guard case . failure( let error) = tsc_await ( { callback in packageCollections. addCollection ( mockCollection. source, order: nil , callback: callback) } ) ,
218
+ case PackageCollectionError . trustConfirmationRequired = error else {
212
219
return XCTFail ( " expected error " )
213
220
}
214
221
@@ -225,7 +232,9 @@ final class PackageCollectionsTests: XCTestCase {
225
232
try skipIfUnsupportedPlatform ( )
226
233
227
234
let configuration = PackageCollections . Configuration ( )
228
- let storage = makeMockStorage ( )
235
+ // This test doesn't use search at all and finishes quickly so disable target trie to prevent race
236
+ let storageConfig = SQLitePackageCollectionsStorage . Configuration ( initializeTargetTrie: false )
237
+ let storage = makeMockStorage ( storageConfig)
229
238
defer { XCTAssertNoThrow ( try storage. close ( ) ) }
230
239
231
240
let mockCollection = makeMockCollections ( count: 1 ) . first!
@@ -244,7 +253,7 @@ final class PackageCollectionsTests: XCTestCase {
244
253
245
254
// add fails because collection's signature is invalid
246
255
guard case . failure( let error) = tsc_await ( { callback in packageCollections. addCollection ( mockCollection. source, order: nil , callback: callback) } ) ,
247
- PackageCollectionError . invalidSignature == error as? PackageCollectionError else {
256
+ case PackageCollectionError . invalidSignature = error else {
248
257
return XCTFail ( " expected PackageCollectionError.invalidSignature " )
249
258
}
250
259
0 commit comments