Skip to content

Commit e5bf062

Browse files
authored
Update HubApi tests to account for resolve-cache URLs (#209)
1 parent 72600cf commit e5bf062

File tree

1 file changed

+5
-7
lines changed

1 file changed

+5
-7
lines changed

Tests/HubTests/HubApiTests.swift

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ class HubApiTests: XCTestCase {
9595

9696
XCTAssertNotNil(metadata.commitHash)
9797
XCTAssertNotNil(metadata.etag)
98-
XCTAssertEqual(metadata.location, url?.absoluteString)
98+
XCTAssertEqual(URL(string: metadata.location)?.path, "/api/resolve-cache/models\(url!.path.replacingOccurrences(of: "resolve/main", with: metadata.commitHash!))")
9999
XCTAssertEqual(metadata.size, 163)
100100
} catch {
101101
XCTFail("\(error)")
@@ -109,7 +109,7 @@ class HubApiTests: XCTestCase {
109109

110110
XCTAssertNotNil(metadata.commitHash)
111111
XCTAssertTrue(metadata.etag != nil && metadata.etag!.hasPrefix("d6ceb9"))
112-
XCTAssertEqual(metadata.location, url?.absoluteString)
112+
XCTAssertEqual(URL(string: metadata.location)?.path, "/api/resolve-cache/models\(url!.path.replacingOccurrences(of: "resolve/main", with: metadata.commitHash!))")
113113
XCTAssertEqual(metadata.size, 163)
114114
} catch {
115115
XCTFail("\(error)")
@@ -125,7 +125,7 @@ class HubApiTests: XCTestCase {
125125
XCTAssertEqual(metadata.commitHash, revision)
126126
XCTAssertNotNil(metadata.etag)
127127
XCTAssertGreaterThan(metadata.etag!.count, 0)
128-
// XCTAssertEqual(metadata.location, url?.absoluteString) // TODO: does not pass on main, is it even relevant?
128+
XCTAssertEqual(URL(string: metadata.location)?.path, "/api/resolve-cache/models\(url!.path.replacingOccurrences(of: "resolve/\(revision)", with: metadata.commitHash!))")
129129
XCTAssertEqual(metadata.size, 851)
130130
} catch {
131131
XCTFail("\(error)")
@@ -134,13 +134,11 @@ class HubApiTests: XCTestCase {
134134

135135
func testGetFileMetadataWithBlobSearch() async throws {
136136
let repo = "coreml-projects/Llama-2-7b-chat-coreml"
137-
let metadataFromBlob = try await Hub.getFileMetadata(from: repo, matching: "*.json").sorted { $0.location < $1.location }
138-
let files = try await Hub.getFilenames(from: repo, matching: "*.json").sorted()
139-
for (metadata, file) in zip(metadataFromBlob, files) {
137+
let metadataFromBlob = try await Hub.getFileMetadata(from: repo, matching: "*.json")
138+
for metadata in metadataFromBlob {
140139
XCTAssertNotNil(metadata.commitHash)
141140
XCTAssertNotNil(metadata.etag)
142141
XCTAssertGreaterThan(metadata.etag!.count, 0)
143-
XCTAssertTrue(metadata.location.contains(file))
144142
XCTAssertGreaterThan(metadata.size!, 0)
145143
}
146144
}

0 commit comments

Comments
 (0)