Skip to content

Commit c33cde3

Browse files
authored
Merge pull request #582 from tianon/fix-last-test
Fix `last` pagination conformance test
2 parents 583e014 + 03b7b0b commit c33cde3

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

conformance/03_discovery_test.go

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -272,7 +272,6 @@ var test03ContentDiscovery = func() {
272272
Expect(err).To(BeNil())
273273
Expect(resp.StatusCode()).To(Equal(http.StatusOK))
274274
tagList = getTagList(resp)
275-
Expect(err).To(BeNil())
276275
Expect(len(tagList)).To(Equal(numResults))
277276
})
278277

@@ -283,16 +282,18 @@ var test03ContentDiscovery = func() {
283282
SetQueryParam("n", strconv.Itoa(numResults))
284283
resp, err := client.Do(req)
285284
Expect(err).To(BeNil())
285+
Expect(resp.StatusCode()).To(Equal(http.StatusOK))
286286
tagList = getTagList(resp)
287+
last := tagList[numResults-1]
287288
req = client.NewRequest(reggie.GET, "/v2/<name>/tags/list").
288289
SetQueryParam("n", strconv.Itoa(numResults)).
289290
SetQueryParam("last", tagList[numResults-1])
290291
resp, err = client.Do(req)
291292
Expect(err).To(BeNil())
292293
Expect(resp.StatusCode()).To(Equal(http.StatusOK))
293-
Expect(err).To(BeNil())
294+
tagList = getTagList(resp)
294295
Expect(len(tagList)).To(BeNumerically("<=", numResults))
295-
Expect(tagList).To(ContainElement(tagList[numResults-1]))
296+
Expect(tagList).ToNot(ContainElement(last))
296297
})
297298
})
298299

0 commit comments

Comments
 (0)