From 4e90abc6a353f733de6d1c47303a7de0ba0a369f Mon Sep 17 00:00:00 2001 From: Tai Groot Date: Sun, 1 Mar 2026 00:47:23 +0000 Subject: [PATCH] fix: update integration tests for Install/Remove multi-return signature --- apk/apk_integration_test.go | 12 ++++++------ apt/apt_integration_test.go | 18 +++++++++--------- dnf/dnf_integration_test.go | 18 +++++++++--------- dpkg/dpkg_integration_test.go | 2 +- flatpak/flatpak_integration_test.go | 4 ++-- pacman/pacman_integration_test.go | 12 ++++++------ pkg/pkg_integration_test.go | 4 ++-- rpm/rpm_integration_test.go | 2 +- snap/snap_integration_test.go | 8 ++++---- 9 files changed, 40 insertions(+), 40 deletions(-) diff --git a/apk/apk_integration_test.go b/apk/apk_integration_test.go index f8f9bb7..38472ff 100644 --- a/apk/apk_integration_test.go +++ b/apk/apk_integration_test.go @@ -74,8 +74,8 @@ func TestIntegration_Apk(t *testing.T) { }) t.Run("Install_Single", func(t *testing.T) { - _ = mgr.Remove(ctx, snack.Targets("tree")) - err := mgr.Install(ctx, snack.Targets("tree")) + _, _ = mgr.Remove(ctx, snack.Targets("tree")) + _, err := mgr.Install(ctx, snack.Targets("tree")) require.NoError(t, err) }) @@ -128,7 +128,7 @@ func TestIntegration_Apk(t *testing.T) { }) t.Run("Install_Multiple", func(t *testing.T) { - err := mgr.Install(ctx, snack.Targets("tree", "less")) + _, err := mgr.Install(ctx, snack.Targets("tree", "less")) require.NoError(t, err) for _, pkg := range []string{"tree", "less"} { @@ -149,7 +149,7 @@ func TestIntegration_Apk(t *testing.T) { }) t.Run("Remove", func(t *testing.T) { - err := mgr.Remove(ctx, snack.Targets("tree")) + _, err := mgr.Remove(ctx, snack.Targets("tree")) require.NoError(t, err) installed, err := mgr.IsInstalled(ctx, "tree") @@ -227,7 +227,7 @@ func TestIntegration_Apk(t *testing.T) { require.True(t, ok) // Install tree for file tests - _ = mgr.Install(ctx, snack.Targets("tree")) + _, _ = mgr.Install(ctx, snack.Targets("tree")) t.Run("FileList", func(t *testing.T) { files, err := fo.FileList(ctx, "tree") @@ -252,7 +252,7 @@ func TestIntegration_Apk(t *testing.T) { assert.Error(t, err) }) - _ = mgr.Remove(ctx, snack.Targets("tree")) + _, _ = mgr.Remove(ctx, snack.Targets("tree")) }) // --- Upgrade --- diff --git a/apt/apt_integration_test.go b/apt/apt_integration_test.go index d9e4593..bd85a97 100644 --- a/apt/apt_integration_test.go +++ b/apt/apt_integration_test.go @@ -75,9 +75,9 @@ func TestIntegration_Apt(t *testing.T) { t.Run("Install_Single", func(t *testing.T) { // Remove first to ensure clean state - _ = mgr.Remove(ctx, snack.Targets("tree"), snack.WithAssumeYes()) + _, _, _ = mgr.Remove(ctx, snack.Targets("tree"), snack.WithAssumeYes()) - err := mgr.Install(ctx, snack.Targets("tree"), snack.WithAssumeYes()) + _, _, err := mgr.Install(ctx, snack.Targets("tree"), snack.WithAssumeYes()) require.NoError(t, err) }) @@ -127,7 +127,7 @@ func TestIntegration_Apt(t *testing.T) { ver, err := mgr.Version(ctx, "tree") require.NoError(t, err) - err = mgr.Install(ctx, []snack.Target{{Name: "tree", Version: ver}}, snack.WithAssumeYes()) + _, _, err = mgr.Install(ctx, []snack.Target{{Name: "tree", Version: ver}}, snack.WithAssumeYes()) // Should succeed (already installed at that version) or be a no-op // Some apt versions may return success, others may note it's already installed _ = err @@ -135,7 +135,7 @@ func TestIntegration_Apt(t *testing.T) { t.Run("Purge", func(t *testing.T) { // Install then purge (removes config files too) - _ = mgr.Install(ctx, snack.Targets("tree"), snack.WithAssumeYes()) + _, _, _ = mgr.Install(ctx, snack.Targets("tree"), snack.WithAssumeYes()) err := mgr.Purge(ctx, snack.Targets("tree"), snack.WithAssumeYes()) require.NoError(t, err) @@ -145,7 +145,7 @@ func TestIntegration_Apt(t *testing.T) { }) t.Run("Install_Multiple", func(t *testing.T) { - err := mgr.Install(ctx, snack.Targets("tree", "less"), snack.WithAssumeYes()) + _, _, err := mgr.Install(ctx, snack.Targets("tree", "less"), snack.WithAssumeYes()) require.NoError(t, err) for _, pkg := range []string{"tree", "less"} { @@ -156,7 +156,7 @@ func TestIntegration_Apt(t *testing.T) { }) t.Run("Remove", func(t *testing.T) { - err := mgr.Remove(ctx, snack.Targets("tree"), snack.WithAssumeYes()) + _, _, err := mgr.Remove(ctx, snack.Targets("tree"), snack.WithAssumeYes()) require.NoError(t, err) installed, err := mgr.IsInstalled(ctx, "tree") @@ -223,7 +223,7 @@ func TestIntegration_Apt(t *testing.T) { require.True(t, ok, "apt must implement Holder") // Ensure tree is installed for hold tests - _ = mgr.Install(ctx, snack.Targets("tree"), snack.WithAssumeYes()) + _, _, _ = mgr.Install(ctx, snack.Targets("tree"), snack.WithAssumeYes()) t.Run("Hold", func(t *testing.T) { err := h.Hold(ctx, []string{"tree"}) @@ -287,7 +287,7 @@ func TestIntegration_Apt(t *testing.T) { require.True(t, ok, "apt must implement FileOwner") // Ensure tree is installed - _ = mgr.Install(ctx, snack.Targets("tree"), snack.WithAssumeYes()) + _, _, _ = mgr.Install(ctx, snack.Targets("tree"), snack.WithAssumeYes()) t.Run("FileList", func(t *testing.T) { files, err := fo.FileList(ctx, "tree") @@ -379,5 +379,5 @@ func TestIntegration_Apt(t *testing.T) { }) // Cleanup - _ = mgr.Remove(ctx, snack.Targets("tree", "less"), snack.WithAssumeYes()) + _, _, _ = mgr.Remove(ctx, snack.Targets("tree", "less"), snack.WithAssumeYes()) } diff --git a/dnf/dnf_integration_test.go b/dnf/dnf_integration_test.go index 0e0133b..7c72658 100644 --- a/dnf/dnf_integration_test.go +++ b/dnf/dnf_integration_test.go @@ -80,8 +80,8 @@ func TestIntegration_DNF(t *testing.T) { }) t.Run("Install_Single", func(t *testing.T) { - _ = mgr.Remove(ctx, snack.Targets("tree"), snack.WithAssumeYes()) - err := mgr.Install(ctx, snack.Targets("tree"), snack.WithAssumeYes()) + _, _ = mgr.Remove(ctx, snack.Targets("tree"), snack.WithAssumeYes()) + _, err := mgr.Install(ctx, snack.Targets("tree"), snack.WithAssumeYes()) require.NoError(t, err) }) @@ -127,7 +127,7 @@ func TestIntegration_DNF(t *testing.T) { }) t.Run("Install_Multiple", func(t *testing.T) { - err := mgr.Install(ctx, snack.Targets("tree", "less"), snack.WithAssumeYes()) + _, err := mgr.Install(ctx, snack.Targets("tree", "less"), snack.WithAssumeYes()) require.NoError(t, err) for _, pkg := range []string{"tree", "less"} { @@ -138,7 +138,7 @@ func TestIntegration_DNF(t *testing.T) { }) t.Run("Install_WithRefresh", func(t *testing.T) { - err := mgr.Install(ctx, snack.Targets("tree"), snack.WithAssumeYes(), snack.WithRefresh()) + _, err := mgr.Install(ctx, snack.Targets("tree"), snack.WithAssumeYes(), snack.WithRefresh()) require.NoError(t, err) }) @@ -152,7 +152,7 @@ func TestIntegration_DNF(t *testing.T) { }) t.Run("Remove", func(t *testing.T) { - err := mgr.Remove(ctx, snack.Targets("tree"), snack.WithAssumeYes()) + _, err := mgr.Remove(ctx, snack.Targets("tree"), snack.WithAssumeYes()) require.NoError(t, err) installed, err := mgr.IsInstalled(ctx, "tree") @@ -217,7 +217,7 @@ func TestIntegration_DNF(t *testing.T) { require.True(t, ok) // Install tree for hold tests; also ensure versionlock plugin - _ = mgr.Install(ctx, snack.Targets("tree"), snack.WithAssumeYes()) + _, _ = mgr.Install(ctx, snack.Targets("tree"), snack.WithAssumeYes()) t.Run("Hold", func(t *testing.T) { err := h.Hold(ctx, []string{"tree"}) @@ -254,7 +254,7 @@ func TestIntegration_DNF(t *testing.T) { }) }) - _ = mgr.Remove(ctx, snack.Targets("tree"), snack.WithAssumeYes()) + _, _ = mgr.Remove(ctx, snack.Targets("tree"), snack.WithAssumeYes()) }) // --- Cleaner --- @@ -278,7 +278,7 @@ func TestIntegration_DNF(t *testing.T) { fo, ok := mgr.(snack.FileOwner) require.True(t, ok) - _ = mgr.Install(ctx, snack.Targets("tree"), snack.WithAssumeYes()) + _, _ = mgr.Install(ctx, snack.Targets("tree"), snack.WithAssumeYes()) t.Run("FileList", func(t *testing.T) { files, err := fo.FileList(ctx, "tree") @@ -311,7 +311,7 @@ func TestIntegration_DNF(t *testing.T) { assert.Error(t, err) }) - _ = mgr.Remove(ctx, snack.Targets("tree"), snack.WithAssumeYes()) + _, _ = mgr.Remove(ctx, snack.Targets("tree"), snack.WithAssumeYes()) }) // --- RepoManager --- diff --git a/dpkg/dpkg_integration_test.go b/dpkg/dpkg_integration_test.go index 5c4e069..f6603b6 100644 --- a/dpkg/dpkg_integration_test.go +++ b/dpkg/dpkg_integration_test.go @@ -164,7 +164,7 @@ func TestIntegration_Dpkg(t *testing.T) { t.Run("Install_Unsupported", func(t *testing.T) { // dpkg install requires a .deb file path, not a package name // This should fail gracefully - err := mgr.Install(ctx, snack.Targets("tree")) + _, _, err := mgr.Install(ctx, snack.Targets("tree")) assert.Error(t, err) }) diff --git a/flatpak/flatpak_integration_test.go b/flatpak/flatpak_integration_test.go index 409b131..ffff002 100644 --- a/flatpak/flatpak_integration_test.go +++ b/flatpak/flatpak_integration_test.go @@ -67,7 +67,7 @@ func TestIntegration_Flatpak(t *testing.T) { }) t.Run("Install", func(t *testing.T) { - err := mgr.Install(ctx, snack.Targets("com.github.tchx84.Flatseal"), snack.WithSudo(), snack.WithAssumeYes()) + _, err := mgr.Install(ctx, snack.Targets("com.github.tchx84.Flatseal"), snack.WithSudo(), snack.WithAssumeYes()) require.NoError(t, err) }) @@ -121,7 +121,7 @@ func TestIntegration_Flatpak(t *testing.T) { }) t.Run("Remove", func(t *testing.T) { - err := mgr.Remove(ctx, snack.Targets("com.github.tchx84.Flatseal"), snack.WithSudo(), snack.WithAssumeYes()) + _, err := mgr.Remove(ctx, snack.Targets("com.github.tchx84.Flatseal"), snack.WithSudo(), snack.WithAssumeYes()) require.NoError(t, err) }) diff --git a/pacman/pacman_integration_test.go b/pacman/pacman_integration_test.go index 9e2b68d..86a883b 100644 --- a/pacman/pacman_integration_test.go +++ b/pacman/pacman_integration_test.go @@ -71,8 +71,8 @@ func TestIntegration_Pacman(t *testing.T) { }) t.Run("Install_Single", func(t *testing.T) { - _ = mgr.Remove(ctx, snack.Targets("tree")) - err := mgr.Install(ctx, snack.Targets("tree"), snack.WithAssumeYes()) + _, _ = mgr.Remove(ctx, snack.Targets("tree")) + _, err := mgr.Install(ctx, snack.Targets("tree"), snack.WithAssumeYes()) require.NoError(t, err) }) @@ -117,7 +117,7 @@ func TestIntegration_Pacman(t *testing.T) { }) t.Run("Install_Multiple", func(t *testing.T) { - err := mgr.Install(ctx, snack.Targets("tree", "less"), snack.WithAssumeYes()) + _, err := mgr.Install(ctx, snack.Targets("tree", "less"), snack.WithAssumeYes()) require.NoError(t, err) for _, pkg := range []string{"tree", "less"} { @@ -137,7 +137,7 @@ func TestIntegration_Pacman(t *testing.T) { }) t.Run("Remove", func(t *testing.T) { - err := mgr.Remove(ctx, snack.Targets("tree"), snack.WithAssumeYes()) + _, err := mgr.Remove(ctx, snack.Targets("tree"), snack.WithAssumeYes()) require.NoError(t, err) installed, err := mgr.IsInstalled(ctx, "tree") @@ -212,7 +212,7 @@ func TestIntegration_Pacman(t *testing.T) { fo, ok := mgr.(snack.FileOwner) require.True(t, ok) - _ = mgr.Install(ctx, snack.Targets("tree"), snack.WithAssumeYes()) + _, _ = mgr.Install(ctx, snack.Targets("tree"), snack.WithAssumeYes()) t.Run("FileList", func(t *testing.T) { files, err := fo.FileList(ctx, "tree") @@ -245,7 +245,7 @@ func TestIntegration_Pacman(t *testing.T) { assert.Error(t, err) }) - _ = mgr.Remove(ctx, snack.Targets("tree"), snack.WithAssumeYes()) + _, _ = mgr.Remove(ctx, snack.Targets("tree"), snack.WithAssumeYes()) }) // --- Grouper --- diff --git a/pkg/pkg_integration_test.go b/pkg/pkg_integration_test.go index 069fbd0..d7f8292 100644 --- a/pkg/pkg_integration_test.go +++ b/pkg/pkg_integration_test.go @@ -38,7 +38,7 @@ func TestIntegration_Pkg(t *testing.T) { }) t.Run("Install", func(t *testing.T) { - err := mgr.Install(ctx, snack.Targets("tree"), snack.WithSudo(), snack.WithAssumeYes()) + _, err := mgr.Install(ctx, snack.Targets("tree"), snack.WithSudo(), snack.WithAssumeYes()) require.NoError(t, err) }) @@ -68,7 +68,7 @@ func TestIntegration_Pkg(t *testing.T) { }) t.Run("Remove", func(t *testing.T) { - err := mgr.Remove(ctx, snack.Targets("tree"), snack.WithSudo(), snack.WithAssumeYes()) + _, err := mgr.Remove(ctx, snack.Targets("tree"), snack.WithSudo(), snack.WithAssumeYes()) require.NoError(t, err) }) diff --git a/rpm/rpm_integration_test.go b/rpm/rpm_integration_test.go index de670ec..f273cff 100644 --- a/rpm/rpm_integration_test.go +++ b/rpm/rpm_integration_test.go @@ -156,7 +156,7 @@ func TestIntegration_RPM(t *testing.T) { // --- Operations rpm doesn't support --- t.Run("Install_Unsupported", func(t *testing.T) { - err := mgr.Install(ctx, snack.Targets("tree")) + _, err := mgr.Install(ctx, snack.Targets("tree")) assert.Error(t, err) }) diff --git a/snap/snap_integration_test.go b/snap/snap_integration_test.go index 7762ed4..95569fa 100644 --- a/snap/snap_integration_test.go +++ b/snap/snap_integration_test.go @@ -61,8 +61,8 @@ func TestIntegration_Snap(t *testing.T) { }) t.Run("Install", func(t *testing.T) { - _ = mgr.Remove(ctx, snack.Targets("hello-world"), snack.WithSudo()) - err := mgr.Install(ctx, snack.Targets("hello-world"), snack.WithSudo()) + _, _ = mgr.Remove(ctx, snack.Targets("hello-world"), snack.WithSudo()) + _, err := mgr.Install(ctx, snack.Targets("hello-world"), snack.WithSudo()) require.NoError(t, err) }) @@ -152,7 +152,7 @@ func TestIntegration_Snap(t *testing.T) { }) t.Run("Remove", func(t *testing.T) { - err := mgr.Remove(ctx, snack.Targets("hello-world"), snack.WithSudo()) + _, err := mgr.Remove(ctx, snack.Targets("hello-world"), snack.WithSudo()) require.NoError(t, err) installed, err := mgr.IsInstalled(ctx, "hello-world") @@ -161,7 +161,7 @@ func TestIntegration_Snap(t *testing.T) { }) t.Run("Purge", func(t *testing.T) { - _ = mgr.Install(ctx, snack.Targets("hello-world"), snack.WithSudo()) + _, _ = mgr.Install(ctx, snack.Targets("hello-world"), snack.WithSudo()) err := mgr.Purge(ctx, snack.Targets("hello-world"), snack.WithSudo()) require.NoError(t, err) })