mirror of
https://github.com/Jguer/yay
synced 2024-10-31 04:12:51 +00:00
test(sources): add PKGBUILD source tests
This commit is contained in:
parent
aedbcffc80
commit
1d903b6c7e
3 changed files with 162 additions and 8 deletions
|
@ -31,9 +31,9 @@ func (e *ErrDownloadSource) Unwrap() error {
|
||||||
return e.inner
|
return e.inner
|
||||||
}
|
}
|
||||||
|
|
||||||
func downloadPKGBUILDSource(ctx context.Context, cmdBuilder exe.ICmdBuilder,
|
func downloadPKGBUILDSource(ctx context.Context, cmdBuilder exe.ICmdBuilder, dest,
|
||||||
base string, incompatible stringset.StringSet) (err error) {
|
base string, incompatible stringset.StringSet) (err error) {
|
||||||
dir := filepath.Join(config.BuildDir, base)
|
dir := filepath.Join(dest, base)
|
||||||
args := []string{"--verifysource", "-Ccf"}
|
args := []string{"--verifysource", "-Ccf"}
|
||||||
|
|
||||||
if incompatible.Get(base) {
|
if incompatible.Get(base) {
|
||||||
|
@ -49,11 +49,11 @@ func downloadPKGBUILDSource(ctx context.Context, cmdBuilder exe.ICmdBuilder,
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func downloadPKGBUILDSourceWorker(ctx context.Context, wg *sync.WaitGroup,
|
func downloadPKGBUILDSourceWorker(ctx context.Context, wg *sync.WaitGroup, dest string,
|
||||||
cBase <-chan string, valOut chan<- string, errOut chan<- error,
|
cBase <-chan string, valOut chan<- string, errOut chan<- error,
|
||||||
cmdBuilder exe.ICmdBuilder, incompatible stringset.StringSet) {
|
cmdBuilder exe.ICmdBuilder, incompatible stringset.StringSet) {
|
||||||
for base := range cBase {
|
for base := range cBase {
|
||||||
err := downloadPKGBUILDSource(ctx, cmdBuilder, base, incompatible)
|
err := downloadPKGBUILDSource(ctx, cmdBuilder, dest, base, incompatible)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
errOut <- ErrDownloadSource{inner: err, pkgName: base, errOut: ""}
|
errOut <- ErrDownloadSource{inner: err, pkgName: base, errOut: ""}
|
||||||
} else {
|
} else {
|
||||||
|
@ -64,10 +64,10 @@ func downloadPKGBUILDSourceWorker(ctx context.Context, wg *sync.WaitGroup,
|
||||||
wg.Done()
|
wg.Done()
|
||||||
}
|
}
|
||||||
|
|
||||||
func downloadPKGBUILDSourceFanout(ctx context.Context, cmdBuilder exe.ICmdBuilder,
|
func downloadPKGBUILDSourceFanout(ctx context.Context, cmdBuilder exe.ICmdBuilder, dest string,
|
||||||
bases []dep.Base, incompatible stringset.StringSet) error {
|
bases []dep.Base, incompatible stringset.StringSet) error {
|
||||||
if len(bases) == 1 {
|
if len(bases) == 1 {
|
||||||
return downloadPKGBUILDSource(ctx, cmdBuilder, bases[0].Pkgbase(), incompatible)
|
return downloadPKGBUILDSource(ctx, cmdBuilder, dest, bases[0].Pkgbase(), incompatible)
|
||||||
}
|
}
|
||||||
|
|
||||||
var (
|
var (
|
||||||
|
@ -90,7 +90,7 @@ func downloadPKGBUILDSourceFanout(ctx context.Context, cmdBuilder exe.ICmdBuilde
|
||||||
wg.Add(numOfWorkers)
|
wg.Add(numOfWorkers)
|
||||||
|
|
||||||
for s := 0; s < numOfWorkers; s++ {
|
for s := 0; s < numOfWorkers; s++ {
|
||||||
go downloadPKGBUILDSourceWorker(ctx, wg, c,
|
go downloadPKGBUILDSourceWorker(ctx, wg, dest, c,
|
||||||
fanInChanValues, fanInChanErrors, cmdBuilder, incompatible)
|
fanInChanValues, fanInChanErrors, cmdBuilder, incompatible)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
154
aur_source_test.go
Normal file
154
aur_source_test.go
Normal file
|
@ -0,0 +1,154 @@
|
||||||
|
package main
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"os/exec"
|
||||||
|
"sync/atomic"
|
||||||
|
"testing"
|
||||||
|
|
||||||
|
"github.com/stretchr/testify/assert"
|
||||||
|
|
||||||
|
"github.com/Jguer/aur"
|
||||||
|
|
||||||
|
"github.com/Jguer/yay/v10/pkg/dep"
|
||||||
|
"github.com/Jguer/yay/v10/pkg/multierror"
|
||||||
|
"github.com/Jguer/yay/v10/pkg/settings/exe"
|
||||||
|
"github.com/Jguer/yay/v10/pkg/stringset"
|
||||||
|
)
|
||||||
|
|
||||||
|
type TestMakepkgBuilder struct {
|
||||||
|
exe.ICmdBuilder
|
||||||
|
parentBuilder *exe.CmdBuilder
|
||||||
|
test *testing.T
|
||||||
|
passes uint32
|
||||||
|
want string
|
||||||
|
wantDir string
|
||||||
|
showError error
|
||||||
|
}
|
||||||
|
|
||||||
|
func (z *TestMakepkgBuilder) BuildMakepkgCmd(ctx context.Context, dir string, extraArgs ...string) *exec.Cmd {
|
||||||
|
cmd := z.parentBuilder.BuildMakepkgCmd(ctx, dir, extraArgs...)
|
||||||
|
if z.want != "" {
|
||||||
|
assert.Contains(z.test, cmd.String(), z.want)
|
||||||
|
}
|
||||||
|
if z.wantDir != "" {
|
||||||
|
assert.Equal(z.test, z.wantDir, cmd.Dir)
|
||||||
|
}
|
||||||
|
|
||||||
|
atomic.AddUint32(&z.passes, 1)
|
||||||
|
|
||||||
|
return cmd
|
||||||
|
}
|
||||||
|
|
||||||
|
func (z *TestMakepkgBuilder) Show(cmd *exec.Cmd) error {
|
||||||
|
return z.showError
|
||||||
|
}
|
||||||
|
|
||||||
|
// GIVEN 1 package
|
||||||
|
// WHEN downloadPKGBUILDSource is called
|
||||||
|
// THEN 1 call should be made to makepkg with the specified parameters and dir
|
||||||
|
func Test_downloadPKGBUILDSource(t *testing.T) {
|
||||||
|
t.Parallel()
|
||||||
|
cmdBuilder := &TestMakepkgBuilder{
|
||||||
|
parentBuilder: &exe.CmdBuilder{MakepkgConfPath: "/etc/not.conf", MakepkgFlags: []string{"--nocheck"}, MakepkgBin: "makepkg"},
|
||||||
|
test: t,
|
||||||
|
want: "makepkg --nocheck --config /etc/not.conf --verifysource -Ccf",
|
||||||
|
wantDir: "/tmp/yay-bin",
|
||||||
|
}
|
||||||
|
err := downloadPKGBUILDSource(context.TODO(), cmdBuilder, "/tmp", "yay-bin", stringset.Make())
|
||||||
|
assert.NoError(t, err)
|
||||||
|
assert.Equal(t, 1, int(cmdBuilder.passes))
|
||||||
|
}
|
||||||
|
|
||||||
|
// GIVEN 1 package
|
||||||
|
// WHEN downloadPKGBUILDSource is called
|
||||||
|
// THEN 1 call should be made to makepkg which should return error
|
||||||
|
func Test_downloadPKGBUILDSourceError(t *testing.T) {
|
||||||
|
t.Parallel()
|
||||||
|
cmdBuilder := &TestMakepkgBuilder{
|
||||||
|
parentBuilder: &exe.CmdBuilder{MakepkgConfPath: "/etc/not.conf", MakepkgFlags: []string{"--nocheck"}, MakepkgBin: "makepkg"},
|
||||||
|
test: t,
|
||||||
|
want: "makepkg --nocheck --config /etc/not.conf --verifysource -Ccf",
|
||||||
|
wantDir: "/tmp/yay-bin",
|
||||||
|
showError: &exec.ExitError{},
|
||||||
|
}
|
||||||
|
err := downloadPKGBUILDSource(context.TODO(), cmdBuilder, "/tmp", "yay-bin", stringset.Make())
|
||||||
|
assert.Error(t, err)
|
||||||
|
assert.EqualError(t, err, "error downloading sources: \x1b[36myay-bin\x1b[0m \n\t context: <nil> \n\t \n")
|
||||||
|
}
|
||||||
|
|
||||||
|
// GIVEN 5 packages
|
||||||
|
// WHEN downloadPKGBUILDSourceFanout is called
|
||||||
|
// THEN 5 calls should be made to makepkg
|
||||||
|
func Test_downloadPKGBUILDSourceFanout(t *testing.T) {
|
||||||
|
t.Parallel()
|
||||||
|
cmdBuilder := &TestMakepkgBuilder{
|
||||||
|
parentBuilder: &exe.CmdBuilder{
|
||||||
|
MakepkgConfPath: "/etc/not.conf",
|
||||||
|
MakepkgFlags: []string{"--nocheck"}, MakepkgBin: "makepkg",
|
||||||
|
},
|
||||||
|
test: t,
|
||||||
|
}
|
||||||
|
|
||||||
|
bases := []dep.Base{
|
||||||
|
{&aur.Pkg{PackageBase: "yay"}},
|
||||||
|
{&aur.Pkg{PackageBase: "yay-bin"}},
|
||||||
|
{&aur.Pkg{PackageBase: "yay-git"}},
|
||||||
|
{&aur.Pkg{PackageBase: "yay-v11"}},
|
||||||
|
{&aur.Pkg{PackageBase: "yay-v12"}},
|
||||||
|
}
|
||||||
|
|
||||||
|
err := downloadPKGBUILDSourceFanout(context.TODO(), cmdBuilder, "/tmp", bases, stringset.Make())
|
||||||
|
assert.NoError(t, err)
|
||||||
|
assert.Equal(t, 5, int(cmdBuilder.passes))
|
||||||
|
}
|
||||||
|
|
||||||
|
// GIVEN 1 package
|
||||||
|
// WHEN downloadPKGBUILDSourceFanout is called
|
||||||
|
// THEN 1 calls should be made to makepkg without concurrency
|
||||||
|
func Test_downloadPKGBUILDSourceFanoutNoCC(t *testing.T) {
|
||||||
|
t.Parallel()
|
||||||
|
cmdBuilder := &TestMakepkgBuilder{
|
||||||
|
parentBuilder: &exe.CmdBuilder{
|
||||||
|
MakepkgConfPath: "/etc/not.conf",
|
||||||
|
MakepkgFlags: []string{"--nocheck"}, MakepkgBin: "makepkg",
|
||||||
|
},
|
||||||
|
test: t,
|
||||||
|
}
|
||||||
|
|
||||||
|
bases := []dep.Base{
|
||||||
|
{&aur.Pkg{PackageBase: "yay"}},
|
||||||
|
}
|
||||||
|
|
||||||
|
err := downloadPKGBUILDSourceFanout(context.TODO(), cmdBuilder, "/tmp", bases, stringset.Make())
|
||||||
|
assert.NoError(t, err)
|
||||||
|
assert.Equal(t, 1, int(cmdBuilder.passes))
|
||||||
|
}
|
||||||
|
|
||||||
|
// GIVEN 5 packages
|
||||||
|
// WHEN downloadPKGBUILDSourceFanout is called
|
||||||
|
// THEN 5 calls should be made to makepkg
|
||||||
|
func Test_downloadPKGBUILDSourceFanoutError(t *testing.T) {
|
||||||
|
t.Parallel()
|
||||||
|
cmdBuilder := &TestMakepkgBuilder{
|
||||||
|
parentBuilder: &exe.CmdBuilder{
|
||||||
|
MakepkgConfPath: "/etc/not.conf",
|
||||||
|
MakepkgFlags: []string{"--nocheck"}, MakepkgBin: "makepkg",
|
||||||
|
},
|
||||||
|
test: t,
|
||||||
|
showError: &exec.ExitError{},
|
||||||
|
}
|
||||||
|
|
||||||
|
bases := []dep.Base{
|
||||||
|
{&aur.Pkg{PackageBase: "yay"}},
|
||||||
|
{&aur.Pkg{PackageBase: "yay-bin"}},
|
||||||
|
{&aur.Pkg{PackageBase: "yay-git"}},
|
||||||
|
{&aur.Pkg{PackageBase: "yay-v11"}},
|
||||||
|
{&aur.Pkg{PackageBase: "yay-v12"}},
|
||||||
|
}
|
||||||
|
|
||||||
|
err := downloadPKGBUILDSourceFanout(context.TODO(), cmdBuilder, "/tmp", bases, stringset.Make())
|
||||||
|
assert.Error(t, err)
|
||||||
|
assert.Equal(t, 5, int(cmdBuilder.passes))
|
||||||
|
assert.Len(t, err.(*multierror.MultiError).Errors, 5)
|
||||||
|
}
|
|
@ -396,7 +396,7 @@ func install(ctx context.Context, cmdArgs *parser.Arguments, dbExecutor db.Execu
|
||||||
config.AURURL, config.Runtime.CompletionPath, config.CompletionInterval, false)
|
config.AURURL, config.Runtime.CompletionPath, config.CompletionInterval, false)
|
||||||
}()
|
}()
|
||||||
|
|
||||||
err = downloadPKGBUILDSourceFanout(ctx, config.Runtime.CmdBuilder, do.Aur, incompatible)
|
err = downloadPKGBUILDSourceFanout(ctx, config.Runtime.CmdBuilder, config.BuildDir, do.Aur, incompatible)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
text.Errorln(err)
|
text.Errorln(err)
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue