add tests

Author: ExplodingDragon

modules/packages/arch/metadata_test.go

@@ -140,26 +140,6 @@ arch = x86_64
 }
 
 func TestParsePackageInfo(t *testing.T) {
-	const PKGINFO = `# Generated by makepkg 6.0.2
-# using fakeroot version 1.31
-pkgname = a
-pkgbase = b
-pkgver = 1-2
-pkgdesc = comment
-url = https://example.com/
-group = group
-builddate = 3
-packager = Name Surname <[email protected]>
-size = 5
-arch = x86_64
-license = BSD
-provides = pvd
-depend = smth
-optdepend = hex
-checkdepend = ola
-makedepend = cmake
-backup = usr/bin/paket1
-`
 	p, err := ParsePackageInfo(strings.NewReader(`PKGINFO`))
 	assert.NoError(t, err)
 	assert.Equal(t, Package{

services/packages/arch/repository.go

@@ -170,14 +170,13 @@ func flushDB(ctx context.Context, ownerID int64, distro, arch string) (*packages
 	}
 	gw := gzip.NewWriter(db)
 	tw := tar.NewWriter(gw)
-	defer tw.Close()
-	defer gw.Close()
+	count := 0
 	for _, pkg := range pkgs {
 		versions, err := packages_model.GetVersionsByPackageName(
 			ctx, ownerID, packages_model.TypeArch, pkg.Name,
 		)
 		if err != nil {
-			return nil, errors.Join(db.Close(), err)
+			return nil, errors.Join(tw.Close(), gw.Close(), db.Close(), err)
 		}
 		sort.Slice(versions, func(i, j int) bool {
 			return versions[i].CreatedUnix > versions[j].CreatedUnix
@@ -197,7 +196,7 @@ func flushDB(ctx context.Context, ownerID int64, distro, arch string) (*packages
 				ctx, packages_model.PropertyTypeFile, pf.ID, arch_module.PropertyDescription,
 			)
 			if err != nil {
-				return nil, errors.Join(db.Close(), err)
+				return nil, errors.Join(tw.Close(), gw.Close(), db.Close(), err)
 			}
 			if len(pps) >= 1 {
 				meta := []byte(pps[0].Value)
@@ -207,15 +206,21 @@ func flushDB(ctx context.Context, ownerID int64, distro, arch string) (*packages
 					Mode: int64(os.ModePerm),
 				}
 				if err = tw.WriteHeader(header); err != nil {
-					return nil, errors.Join(db.Close(), err)
+					return nil, errors.Join(tw.Close(), gw.Close(), db.Close(), err)
 				}
 				if _, err := tw.Write(meta); err != nil {
-					return nil, errors.Join(db.Close(), err)
+					return nil, errors.Join(tw.Close(), gw.Close(), db.Close(), err)
 				}
+				count++
 				break
 			}
 		}
 	}
+	defer gw.Close()
+	defer tw.Close()
+	if count == 0 {
+		return nil, errors.Join(db.Close(), io.EOF)
+	}
 	return db, nil
 }
 

tests/integration/api_packages_arch_test.go

@@ -10,9 +10,6 @@ import (
 	"compress/gzip"
 	"encoding/base64"
 	"fmt"
-	"github.com/ProtonMail/go-crypto/openpgp/armor"
-	"github.com/ProtonMail/go-crypto/openpgp/packet"
-	"github.com/pkg/errors"
 	"io"
 	"net/http"
 	"strings"
@@ -26,6 +23,9 @@ import (
 	arch_model "code.gitea.io/gitea/modules/packages/arch"
 	"code.gitea.io/gitea/tests"
 
+	"github.com/ProtonMail/go-crypto/openpgp/armor"
+	"github.com/ProtonMail/go-crypto/openpgp/packet"
+	"github.com/pkg/errors"
 	"github.com/stretchr/testify/assert"
 )
 
@@ -245,11 +245,15 @@ nYAR`),
 		req = NewRequestWithBody(t, "DELETE", rootURL+"/base/test2/1.0.0-1", nil).
 			AddBasicAuth(user.Name)
 		MakeRequest(t, req, http.StatusNoContent)
-
 		req = NewRequest(t, "GET", rootURL+"/base/x86_64/base.db")
 		MakeRequest(t, req, http.StatusNotFound)
-	})
 
+		req = NewRequest(t, "GET", rootURL+"/default/x86_64/base.db")
+		respPkg = MakeRequest(t, req, http.StatusOK)
+		files, err = listGzipFiles(respPkg.Body.Bytes())
+		assert.NoError(t, err)
+		assert.Equal(t, 1, len(files))
+	})
 }
 
 func getProperty(data, key string) string {
@@ -279,9 +283,7 @@ func listGzipFiles(data []byte) (fstest.MapFS, error) {
 		if err == io.EOF {
 			break
 		} else if err != nil {
-			if err != nil {
-				return nil, err
-			}
+			return nil, err
 		}
 		if cur.Typeflag != tar.TypeReg {
 			continue