diff options
author | Nanguan Lin <70063547+lng2020@users.noreply.github.com> | 2023-10-10 21:39:58 +0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-10-10 15:39:58 +0200 |
commit | 5b6258a0b94737ec3db1ce418d0c933512a71f78 (patch) | |
tree | d1d1a78491e575734b1a683909d5860c0349a43f /tests/integration | |
parent | 2c7b6c378e73665920056b1b20ecd8fdd78f4045 (diff) | |
download | gitea-5b6258a0b94737ec3db1ce418d0c933512a71f78.tar.gz gitea-5b6258a0b94737ec3db1ce418d0c933512a71f78.zip |
Fix the wrong HTTP response status code for duplicate packages (#27480)
fix #27470
(hope there is nothing missing 😢 )
---------
Co-authored-by: KN4CK3R <admin@oldschoolhack.me>
Diffstat (limited to 'tests/integration')
-rw-r--r-- | tests/integration/api_packages_chef_test.go | 2 | ||||
-rw-r--r-- | tests/integration/api_packages_composer_test.go | 2 | ||||
-rw-r--r-- | tests/integration/api_packages_debian_test.go | 2 | ||||
-rw-r--r-- | tests/integration/api_packages_maven_test.go | 4 | ||||
-rw-r--r-- | tests/integration/api_packages_npm_test.go | 2 | ||||
-rw-r--r-- | tests/integration/api_packages_pub_test.go | 2 | ||||
-rw-r--r-- | tests/integration/api_packages_pypi_test.go | 4 | ||||
-rw-r--r-- | tests/integration/api_packages_rubygems_test.go | 2 |
8 files changed, 10 insertions, 10 deletions
diff --git a/tests/integration/api_packages_chef_test.go b/tests/integration/api_packages_chef_test.go index 4a1fe2607e..7f55a84f09 100644 --- a/tests/integration/api_packages_chef_test.go +++ b/tests/integration/api_packages_chef_test.go @@ -322,7 +322,7 @@ nwIDAQAB assert.Equal(t, fmt.Sprintf("%s.tar.gz", packageVersion), pfs[0].Name) assert.True(t, pfs[0].IsLead) - uploadPackage(t, packageVersion, http.StatusBadRequest) + uploadPackage(t, packageVersion, http.StatusConflict) }) t.Run("Download", func(t *testing.T) { diff --git a/tests/integration/api_packages_composer_test.go b/tests/integration/api_packages_composer_test.go index ac12590561..896462d9a9 100644 --- a/tests/integration/api_packages_composer_test.go +++ b/tests/integration/api_packages_composer_test.go @@ -112,7 +112,7 @@ func TestPackageComposer(t *testing.T) { req = NewRequestWithBody(t, "PUT", uploadURL, bytes.NewReader(content)) req = AddBasicAuthHeader(req, user.Name) - MakeRequest(t, req, http.StatusBadRequest) + MakeRequest(t, req, http.StatusConflict) }) }) diff --git a/tests/integration/api_packages_debian_test.go b/tests/integration/api_packages_debian_test.go index 2d92b93159..f796d617db 100644 --- a/tests/integration/api_packages_debian_test.go +++ b/tests/integration/api_packages_debian_test.go @@ -147,7 +147,7 @@ func TestPackageDebian(t *testing.T) { req = NewRequestWithBody(t, "PUT", uploadURL, createArchive(packageName, packageVersion, architecture)) AddBasicAuthHeader(req, user.Name) - MakeRequest(t, req, http.StatusBadRequest) + MakeRequest(t, req, http.StatusConflict) }) t.Run("Download", func(t *testing.T) { diff --git a/tests/integration/api_packages_maven_test.go b/tests/integration/api_packages_maven_test.go index 81112f305a..c78024563f 100644 --- a/tests/integration/api_packages_maven_test.go +++ b/tests/integration/api_packages_maven_test.go @@ -50,7 +50,7 @@ func TestPackageMaven(t *testing.T) { defer tests.PrintCurrentTest(t)() putFile(t, fmt.Sprintf("/%s/%s", packageVersion, filename), "test", http.StatusCreated) - putFile(t, fmt.Sprintf("/%s/%s", packageVersion, filename), "test", http.StatusBadRequest) + putFile(t, fmt.Sprintf("/%s/%s", packageVersion, filename), "test", http.StatusConflict) putFile(t, "/maven-metadata.xml", "test", http.StatusOK) pvs, err := packages.GetVersionsByPackageType(db.DefaultContext, user.ID, packages.TypeMaven) @@ -78,7 +78,7 @@ func TestPackageMaven(t *testing.T) { t.Run("UploadExists", func(t *testing.T) { defer tests.PrintCurrentTest(t)() - putFile(t, fmt.Sprintf("/%s/%s", packageVersion, filename), "test", http.StatusBadRequest) + putFile(t, fmt.Sprintf("/%s/%s", packageVersion, filename), "test", http.StatusConflict) }) t.Run("Download", func(t *testing.T) { diff --git a/tests/integration/api_packages_npm_test.go b/tests/integration/api_packages_npm_test.go index 433b183c29..bd3bfeeff0 100644 --- a/tests/integration/api_packages_npm_test.go +++ b/tests/integration/api_packages_npm_test.go @@ -121,7 +121,7 @@ func TestPackageNpm(t *testing.T) { req := NewRequestWithBody(t, "PUT", root, strings.NewReader(buildUpload(packageVersion))) req = addTokenAuthHeader(req, token) - MakeRequest(t, req, http.StatusBadRequest) + MakeRequest(t, req, http.StatusConflict) }) t.Run("Download", func(t *testing.T) { diff --git a/tests/integration/api_packages_pub_test.go b/tests/integration/api_packages_pub_test.go index cae280c0ec..6e9d8742f4 100644 --- a/tests/integration/api_packages_pub_test.go +++ b/tests/integration/api_packages_pub_test.go @@ -121,7 +121,7 @@ description: ` + packageDescription assert.NoError(t, err) assert.Equal(t, int64(len(content)), pb.Size) - _ = uploadFile(t, result.URL, content, http.StatusBadRequest) + _ = uploadFile(t, result.URL, content, http.StatusConflict) }) t.Run("Download", func(t *testing.T) { diff --git a/tests/integration/api_packages_pypi_test.go b/tests/integration/api_packages_pypi_test.go index c7c466e730..76013b79c8 100644 --- a/tests/integration/api_packages_pypi_test.go +++ b/tests/integration/api_packages_pypi_test.go @@ -129,8 +129,8 @@ func TestPackagePyPI(t *testing.T) { t.Run("UploadExists", func(t *testing.T) { defer tests.PrintCurrentTest(t)() - uploadFile(t, "test.whl", content, http.StatusBadRequest) - uploadFile(t, "test.tar.gz", content, http.StatusBadRequest) + uploadFile(t, "test.whl", content, http.StatusConflict) + uploadFile(t, "test.tar.gz", content, http.StatusConflict) }) t.Run("Download", func(t *testing.T) { diff --git a/tests/integration/api_packages_rubygems_test.go b/tests/integration/api_packages_rubygems_test.go index 2099357cbb..a3df143209 100644 --- a/tests/integration/api_packages_rubygems_test.go +++ b/tests/integration/api_packages_rubygems_test.go @@ -150,7 +150,7 @@ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA`) t.Run("UploadExists", func(t *testing.T) { defer tests.PrintCurrentTest(t)() - uploadFile(t, http.StatusBadRequest) + uploadFile(t, http.StatusConflict) }) t.Run("Download", func(t *testing.T) { |