-
-
Notifications
You must be signed in to change notification settings - Fork 344
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
feat(upgrade): separate menu for pulled along dependencies (#2141)
try separate menu for pulled along use installed as term fix order gap fix tests add aur db + aur scenario
- Loading branch information
Showing
9 changed files
with
364 additions
and
33 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,137 @@ | ||
| package main | ||
|
|
||
| import ( | ||
| "context" | ||
| "fmt" | ||
| "io" | ||
| "os" | ||
| "os/exec" | ||
| "strings" | ||
| "testing" | ||
|
|
||
| "github.com/Jguer/aur" | ||
| "github.com/stretchr/testify/assert" | ||
| "github.com/stretchr/testify/require" | ||
|
|
||
| "github.com/Jguer/yay/v12/pkg/db/mock" | ||
| mockaur "github.com/Jguer/yay/v12/pkg/dep/mock" | ||
| "github.com/Jguer/yay/v12/pkg/query" | ||
| "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/yay/v12/pkg/text" | ||
| "github.com/Jguer/yay/v12/pkg/vcs" | ||
| ) | ||
|
|
||
| func TestYogurtMenuAURDB(t *testing.T) { | ||
| t.Skip("skip until Operation service is an interface") | ||
| t.Parallel() | ||
| makepkgBin := t.TempDir() + "/makepkg" | ||
| pacmanBin := t.TempDir() + "/pacman" | ||
| gitBin := t.TempDir() + "/git" | ||
| f, err := os.OpenFile(makepkgBin, os.O_RDONLY|os.O_CREATE, 0o755) | ||
| require.NoError(t, err) | ||
| require.NoError(t, f.Close()) | ||
|
|
||
| f, err = os.OpenFile(pacmanBin, os.O_RDONLY|os.O_CREATE, 0o755) | ||
| require.NoError(t, err) | ||
| require.NoError(t, f.Close()) | ||
|
|
||
| f, err = os.OpenFile(gitBin, os.O_RDONLY|os.O_CREATE, 0o755) | ||
| require.NoError(t, err) | ||
| require.NoError(t, f.Close()) | ||
|
|
||
| captureOverride := func(cmd *exec.Cmd) (stdout string, stderr string, err error) { | ||
| return "", "", nil | ||
| } | ||
|
|
||
| showOverride := func(cmd *exec.Cmd) error { | ||
| return nil | ||
| } | ||
|
|
||
| mockRunner := &exe.MockRunner{CaptureFn: captureOverride, ShowFn: showOverride} | ||
| cmdBuilder := &exe.CmdBuilder{ | ||
| MakepkgBin: makepkgBin, | ||
| SudoBin: "su", | ||
| PacmanBin: pacmanBin, | ||
| PacmanConfigPath: "/etc/pacman.conf", | ||
| GitBin: "git", | ||
| Runner: mockRunner, | ||
| SudoLoopEnabled: false, | ||
| } | ||
|
|
||
| cmdArgs := parser.MakeArguments() | ||
| cmdArgs.AddArg("Y") | ||
| cmdArgs.AddTarget("yay") | ||
|
|
||
| db := &mock.DBExecutor{ | ||
| AlpmArchitecturesFn: func() ([]string, error) { | ||
| return []string{"x86_64"}, nil | ||
| }, | ||
| RefreshHandleFn: func() error { | ||
| return nil | ||
| }, | ||
| ReposFn: func() []string { | ||
| return []string{"aur"} | ||
| }, | ||
| SyncPackagesFn: func(s ...string) []mock.IPackage { | ||
| return []mock.IPackage{ | ||
| &mock.Package{ | ||
| PName: "yay", | ||
| PBase: "yay", | ||
| PVersion: "10.0.0", | ||
| PDB: mock.NewDB("aur"), | ||
| }, | ||
| } | ||
| }, | ||
| LocalPackageFn: func(s string) mock.IPackage { | ||
| return nil | ||
| }, | ||
| } | ||
| aurCache := &mockaur.MockAUR{ | ||
| GetFn: func(ctx context.Context, query *aur.Query) ([]aur.Pkg, error) { | ||
| return []aur.Pkg{ | ||
| { | ||
| Name: "yay", | ||
| PackageBase: "yay", | ||
| Version: "10.0.0", | ||
| }, | ||
| }, nil | ||
| }, | ||
| } | ||
| logger := text.NewLogger(io.Discard, os.Stderr, strings.NewReader("1\n"), true, "test") | ||
| cfg := &settings.Configuration{ | ||
| NewInstallEngine: true, | ||
| RemoveMake: "no", | ||
| Runtime: &settings.Runtime{ | ||
| Logger: logger, | ||
| CmdBuilder: cmdBuilder, | ||
| VCSStore: &vcs.Mock{}, | ||
| QueryBuilder: query.NewSourceQueryBuilder(aurCache, logger, "votes", parser.ModeAny, "name", | ||
| true, false, true), | ||
| AURCache: aurCache, | ||
| }, | ||
| } | ||
|
|
||
| err = handleCmd(context.Background(), cfg, cmdArgs, db) | ||
| require.NoError(t, err) | ||
|
|
||
| wantCapture := []string{} | ||
| wantShow := []string{ | ||
| "pacman -S -y --config /etc/pacman.conf --", | ||
| "pacman -S -y -u --config /etc/pacman.conf --", | ||
| } | ||
|
|
||
| require.Len(t, mockRunner.ShowCalls, len(wantShow)) | ||
| require.Len(t, mockRunner.CaptureCalls, len(wantCapture)) | ||
|
|
||
| for i, call := range mockRunner.ShowCalls { | ||
| show := call.Args[0].(*exec.Cmd).String() | ||
| show = strings.ReplaceAll(show, makepkgBin, "makepkg") | ||
| show = strings.ReplaceAll(show, pacmanBin, "pacman") | ||
| show = strings.ReplaceAll(show, gitBin, "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(wantShow[i], " "), fmt.Sprintf("%d - %s", i, show)) | ||
| } | ||
| } |
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
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
Oops, something went wrong.