Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix discovery teardown #479

Merged
merged 6 commits into from
Nov 13, 2023
Merged

fix discovery teardown #479

Changes from 2 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
d164db1
conformance/discovery: set taglist according to response in previous …
waynr Oct 10, 2023
5afc3ee
conformance/discovery: delete all manifests before attempting to dele…
waynr Oct 10, 2023
93bb725
Update conformance/03_discovery_test.go
waynr Nov 11, 2023
4ee0dce
Update conformance/03_discovery_test.go
waynr Nov 11, 2023
4935426
Update conformance/03_discovery_test.go
waynr Nov 11, 2023
9f39697
Update conformance/03_discovery_test.go
waynr Nov 11, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
68 changes: 48 additions & 20 deletions conformance/03_discovery_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -247,6 +247,7 @@ var test03ContentDiscovery = func() {
resp, err := client.Do(req)
Expect(err).To(BeNil())
Expect(resp.StatusCode()).To(Equal(http.StatusOK))
tagList = getTagList(resp)
numTags = len(tagList)
})

Expand Down Expand Up @@ -351,16 +352,29 @@ var test03ContentDiscovery = func() {
g.Specify("Delete created manifest & associated tags", func() {
SkipIfDisabled(contentDiscovery)
RunOnlyIf(runContentDiscoverySetup)
req := client.NewRequest(reggie.DELETE, "/v2/<name>/manifests/<digest>", reggie.WithDigest(manifests[2].Digest))
resp, err := client.Do(req)
Expect(err).To(BeNil())
Expect(resp.StatusCode()).To(SatisfyAny(
SatisfyAll(
BeNumerically(">=", 200),
BeNumerically("<", 300),
),
Equal(http.StatusMethodNotAllowed),
))
references := []string{
refsIndexArtifactDigest,
manifests[2].Digest,
waynr marked this conversation as resolved.
Show resolved Hide resolved
refsManifestAConfigArtifactDigest,
refsManifestAConfigArtifactDigest,
waynr marked this conversation as resolved.
Show resolved Hide resolved
refsManifestALayerArtifactDigest,
testTagName,
refsManifestBConfigArtifactDigest,
refsManifestBLayerArtifactDigest,
}
for _, ref := range references {
req := client.NewRequest(reggie.DELETE, "/v2/<name>/manifests/<digest>", reggie.WithDigest(ref))
resp, err := client.Do(req)
Expect(err).To(BeNil())
Expect(resp.StatusCode()).To(SatisfyAny(
SatisfyAll(
BeNumerically(">=", 200),
BeNumerically("<", 300),
),
Equal(http.StatusMethodNotAllowed),
Equal(http.StatusNotFound),
))
}
})
}

Expand Down Expand Up @@ -398,16 +412,29 @@ var test03ContentDiscovery = func() {
g.Specify("Delete created manifest & associated tags", func() {
SkipIfDisabled(contentDiscovery)
RunOnlyIf(runContentDiscoverySetup)
req := client.NewRequest(reggie.DELETE, "/v2/<name>/manifests/<digest>", reggie.WithDigest(manifests[2].Digest))
resp, err := client.Do(req)
Expect(err).To(BeNil())
Expect(resp.StatusCode()).To(SatisfyAny(
SatisfyAll(
BeNumerically(">=", 200),
BeNumerically("<", 300),
),
Equal(http.StatusMethodNotAllowed),
))
references := []string{
refsIndexArtifactDigest,
manifests[2].Digest,
waynr marked this conversation as resolved.
Show resolved Hide resolved
refsManifestAConfigArtifactDigest,
refsManifestAConfigArtifactDigest,
waynr marked this conversation as resolved.
Show resolved Hide resolved
refsManifestALayerArtifactDigest,
testTagName,
refsManifestBConfigArtifactDigest,
refsManifestBLayerArtifactDigest,
}
for _, ref := range references {
req := client.NewRequest(reggie.DELETE, "/v2/<name>/manifests/<digest>", reggie.WithDigest(ref))
resp, err := client.Do(req)
Expect(err).To(BeNil())
Expect(resp.StatusCode()).To(SatisfyAny(
SatisfyAll(
BeNumerically(">=", 200),
BeNumerically("<", 300),
),
Equal(http.StatusMethodNotAllowed),
Equal(http.StatusNotFound),
))
}
})
}

Expand All @@ -424,6 +451,7 @@ var test03ContentDiscovery = func() {
BeNumerically("<", 300),
),
Equal(http.StatusMethodNotAllowed),
Equal(http.StatusNotFound),
))
}

Expand Down