-
-
Notifications
You must be signed in to change notification settings - Fork 345
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
chore(yay): use new aur client for -Si (#2112)
* chore(yay): use new aur client for -Si * chore(yay): use new client for clean
- Loading branch information
Showing
4 changed files
with
183 additions
and
15 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,162 @@ | ||
| package main | ||
|
|
||
| import ( | ||
| "context" | ||
| "encoding/json" | ||
| "fmt" | ||
| "io" | ||
| "os" | ||
| "os/exec" | ||
| "strings" | ||
| "testing" | ||
|
|
||
| "github.com/Jguer/yay/v12/pkg/db/mock" | ||
| mockaur "github.com/Jguer/yay/v12/pkg/dep/mock" | ||
| "github.com/Jguer/yay/v12/pkg/settings" | ||
| "github.com/Jguer/yay/v12/pkg/settings/exe" | ||
| "github.com/Jguer/yay/v12/pkg/settings/parser" | ||
|
|
||
| "github.com/Jguer/aur" | ||
| "github.com/stretchr/testify/assert" | ||
| "github.com/stretchr/testify/require" | ||
| ) | ||
|
|
||
| func getFromFile(t *testing.T, filePath string) mockaur.GetFunc { | ||
| f, err := os.Open(filePath) | ||
| require.NoError(t, err) | ||
|
|
||
| fBytes, err := io.ReadAll(f) | ||
| require.NoError(t, err) | ||
|
|
||
| pkgs := []aur.Pkg{} | ||
| err = json.Unmarshal(fBytes, &pkgs) | ||
| require.NoError(t, err) | ||
|
|
||
| return func(ctx context.Context, query *aur.Query) ([]aur.Pkg, error) { | ||
| return pkgs, nil | ||
| } | ||
| } | ||
|
|
||
| func TestSyncInfo(t *testing.T) { | ||
| pacmanBin := t.TempDir() + "/pacman" | ||
|
|
||
| t.Parallel() | ||
|
|
||
| testCases := []struct { | ||
| name string | ||
| args []string | ||
| targets []string | ||
| wantShow []string | ||
| wantErr bool | ||
| }{ | ||
| { | ||
| name: "Si linux", | ||
| args: []string{"S", "i"}, | ||
| targets: []string{"linux"}, | ||
| wantShow: []string{"pacman", "-S", "-i", "--config", "/etc/pacman.conf", "--", "linux"}, | ||
| }, | ||
| { | ||
| name: "Si jellyfin", | ||
| args: []string{"S", "i"}, | ||
| targets: []string{"jellyfin"}, | ||
| wantShow: []string{}, | ||
| }, | ||
| { | ||
| name: "Si linux jellyfin", | ||
| args: []string{"S", "i"}, | ||
| targets: []string{"linux", "jellyfin"}, | ||
| wantShow: []string{"pacman", "-S", "-i", "--config", "/etc/pacman.conf", "--", "linux"}, | ||
| }, | ||
| { | ||
| name: "Si jellyfin", | ||
| args: []string{"S", "i"}, | ||
| targets: []string{"jellyfin"}, | ||
| wantShow: []string{}, | ||
| }, | ||
| { | ||
| name: "Si missing", | ||
| args: []string{"S", "i"}, | ||
| targets: []string{"missing"}, | ||
| wantShow: []string{}, | ||
| wantErr: true, | ||
| }, | ||
| } | ||
|
|
||
| dbExc := &mock.DBExecutor{ | ||
| SyncSatisfierFn: func(s string) mock.IPackage { | ||
| if s == "linux" { | ||
| return &mock.Package{ | ||
| PName: "linux", | ||
| PBase: "linux", | ||
| } | ||
| } | ||
| return nil | ||
| }, | ||
| PackagesFromGroupFn: func(s string) []mock.IPackage { | ||
| return nil | ||
| }, | ||
| } | ||
|
|
||
| mockAUR := &mockaur.MockAUR{GetFn: func(ctx context.Context, query *aur.Query) ([]aur.Pkg, error) { | ||
| if query.Needles[0] == "jellyfin" { | ||
| jfinFn := getFromFile(t, "pkg/dep/testdata/jellyfin.json") | ||
| return jfinFn(ctx, query) | ||
| } | ||
|
|
||
| return nil, fmt.Errorf("not found") | ||
| }} | ||
|
|
||
| for _, tc := range testCases { | ||
| t.Run(tc.name, func(t *testing.T) { | ||
| mockRunner := &exe.MockRunner{ | ||
| CaptureFn: func(cmd *exec.Cmd) (stdout string, stderr string, err error) { | ||
| return "", "", nil | ||
| }, | ||
| ShowFn: func(cmd *exec.Cmd) error { return nil }, | ||
| } | ||
| cmdBuilder := &exe.CmdBuilder{ | ||
| SudoBin: "su", | ||
| PacmanBin: pacmanBin, | ||
| PacmanConfigPath: "/etc/pacman.conf", | ||
| GitBin: "git", | ||
| Runner: mockRunner, | ||
| SudoLoopEnabled: false, | ||
| } | ||
| cfg := &settings.Configuration{ | ||
| Runtime: &settings.Runtime{ | ||
| CmdBuilder: cmdBuilder, | ||
| AURCache: mockAUR, | ||
| Logger: NewTestLogger(), | ||
| }, | ||
| } | ||
|
|
||
| cmdArgs := parser.MakeArguments() | ||
| cmdArgs.AddArg(tc.args...) | ||
| cmdArgs.AddTarget(tc.targets...) | ||
|
|
||
| err := handleCmd(context.Background(), | ||
| cfg, cmdArgs, dbExc, | ||
| ) | ||
|
|
||
| if tc.wantErr { | ||
| require.Error(t, err) | ||
| assert.EqualError(t, err, "") | ||
| } else { | ||
| require.NoError(t, err) | ||
| } | ||
| if len(tc.wantShow) == 0 { | ||
| assert.Empty(t, mockRunner.ShowCalls) | ||
| return | ||
| } | ||
| for i, call := range mockRunner.ShowCalls { | ||
| show := call.Args[0].(*exec.Cmd).String() | ||
| show = strings.ReplaceAll(show, pacmanBin, "pacman") | ||
|
|
||
| // options are in a different order on different systems and on CI root user is used | ||
| assert.Subset(t, strings.Split(show, " "), | ||
| strings.Split(tc.wantShow[i], " "), | ||
| fmt.Sprintf("%d - %s", i, show)) | ||
| } | ||
| }) | ||
| } | ||
| } |