Skip to content

Commit 645d190

Browse files
fix test & keep delete path
1 parent c89af8e commit 645d190

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

routers/api/packages/api.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -468,7 +468,7 @@ func CommonRoutes() *web.Router {
468468
g.MatchPath("GET", "/<group:*>/repodata/<filename>", rpm.GetRepositoryFile)
469469
g.MatchPath("PUT", "/<group:*>/upload", reqPackageAccess(perm.AccessModeWrite), rpm.UploadPackageFile)
470470
g.MatchPath("HEAD,GET", "/<group:*>/package/<name>/<version>/<architecture>/<*>", rpm.DownloadPackageFile)
471-
g.MatchPath("DELETE", "/<group:*>/package/<name>/<version>/<architecture>/<*>", reqPackageAccess(perm.AccessModeWrite), rpm.DeletePackageFile)
471+
g.MatchPath("DELETE", "/<group:*>/package/<name>/<version>/<architecture>", reqPackageAccess(perm.AccessModeWrite), rpm.DeletePackageFile)
472472
}, reqPackageAccess(perm.AccessModeRead))
473473

474474
r.Group("/rubygems", func() {

tests/integration/api_packages_rpm_test.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -448,7 +448,8 @@ gpgkey=%sapi/packages/%s/rpm/repository.key`,
448448
pub, err := openpgp.ReadArmoredKeyRing(gpgResp.Body)
449449
require.NoError(t, err)
450450

451-
req = NewRequest(t, "GET", fmt.Sprintf("%s/package/%s/%s/%s", groupURL, packageName, packageVersion, packageArchitecture))
451+
rpmFileName := fmt.Sprintf("%s-%s.%s.rpm", packageName, packageVersion, packageArchitecture)
452+
req = NewRequest(t, "GET", fmt.Sprintf("%s/package/%s/%s/%s/%s", groupURL, packageName, packageVersion, packageArchitecture, rpmFileName))
452453
resp := MakeRequest(t, req, http.StatusOK)
453454

454455
_, sigs, err := rpmutils.Verify(resp.Body, pub)

0 commit comments

Comments
 (0)