add set-ref command and refactor tests

e2e-tests/bash_completion_test.go

@@ -21,7 +21,6 @@ package e2etests_test
 import (
 	"testing"
 
-	"github.com/alecthomas/assert/v2"
 	"github.com/efficientgo/e2e"
 )
 
@@ -31,10 +30,7 @@ func TestE2EBashCompletion(t *testing.T) {
 		"bash-completion",
 		COMMON_SYSTEMS,
 		func(t *testing.T, r e2e.Runnable) {
-			err := r.Exec(e2e.NewCommand(
-				"alr", "install", "--generate-bash-completion",
-			))
-			assert.NoError(t, err)
+			execShouldNoError(t, r, "alr", "install", "--generate-bash-completion")
 		},
 	)
 }

e2e-tests/common_test.go

@@ -159,9 +159,12 @@ func dockerMultipleRun(t *testing.T, name string, ids []string, f func(t *testin
 	})
 }
 
-func simpleExec(t *testing.T, r e2e.Runnable, cmd string, args ...string) {
-	err := r.Exec(e2e.NewCommand(cmd, args...))
-	assert.NoError(t, err)
+func execShouldNoError(t *testing.T, r e2e.Runnable, cmd string, args ...string) {
+	assert.NoError(t, r.Exec(e2e.NewCommand(cmd, args...)))
+}
+
+func execShouldError(t *testing.T, r e2e.Runnable, cmd string, args ...string) {
+	assert.Error(t, r.Exec(e2e.NewCommand(cmd, args...)))
 }
 
 func runTestCommands(t *testing.T, r e2e.Runnable, timeout time.Duration, expects []expect.Batcher) {
@@ -178,4 +181,22 @@ func runTestCommands(t *testing.T, r e2e.Runnable, timeout time.Duration, expect
 	assert.NoError(t, err)
 }
 
-const REPO_FOR_E2E_TESTS = "https://gitea.plemya-x.ru/Maks1mS/repo-for-tests.git"
+const REPO_NAME_FOR_E2E_TESTS = "alr-repo"
+const REPO_URL_FOR_E2E_TESTS = "https://gitea.plemya-x.ru/Maks1mS/repo-for-tests.git"
+
+func defaultPrepare(t *testing.T, r e2e.Runnable) {
+	execShouldNoError(t, r,
+		"sudo",
+		"alr",
+		"repo",
+		"add",
+		REPO_NAME_FOR_E2E_TESTS,
+		REPO_URL_FOR_E2E_TESTS,
+	)
+
+	execShouldNoError(t, r,
+		"sudo",
+		"alr",
+		"ref",
+	)
+}

e2e-tests/group_and_summary_field_test.go

@@ -21,7 +21,6 @@ package e2etests_test
 import (
 	"testing"
 
-	"github.com/alecthomas/assert/v2"
 	"github.com/efficientgo/e2e"
 )
 
@@ -31,26 +30,9 @@ func TestE2EGroupAndSummaryField(t *testing.T) {
 		"group-and-summary-field",
 		RPM_SYSTEMS,
 		func(t *testing.T, r e2e.Runnable) {
-			err := r.Exec(e2e.NewCommand(
-				"sudo",
-				"alr",
-				"addrepo",
-				"--name",
-				"alr-repo",
-				"--url",
-				"https://gitea.plemya-x.ru/Maks1mS/repo-for-tests.git",
-			))
-			assert.NoError(t, err)
-
-			err = r.Exec(e2e.NewCommand(
-				"sh", "-c", "alr search --name test-group-and-summary --format \"{{.Group}}\" | grep ^System/Base$",
-			))
-			assert.NoError(t, err)
-
-			err = r.Exec(e2e.NewCommand(
-				"sh", "-c", "alr search --name test-group-and-summary --format \"{{.Summary}}\" | grep \"^Custom summary$\"",
-			))
-			assert.NoError(t, err)
+			defaultPrepare(t, r)
+			execShouldNoError(t, r, "sh", "-c", "alr search --name test-group-and-summary --format \"{{.Group}}\" | grep ^System/Base$")
+			execShouldNoError(t, r, "sh", "-c", "alr search --name test-group-and-summary --format \"{{.Summary}}\" | grep \"^Custom summary$\"")
 		},
 	)
 }

e2e-tests/issue_32_interactive_test.go

@@ -21,7 +21,6 @@ package e2etests_test
 import (
 	"testing"
 
-	"github.com/alecthomas/assert/v2"
 	"github.com/efficientgo/e2e"
 )
 
@@ -31,25 +30,11 @@ func TestE2EIssue32Interactive(t *testing.T) {
 		"issue-32-interactive",
 		COMMON_SYSTEMS,
 		func(t *testing.T, r e2e.Runnable) {
-			assert.NoError(t, r.Exec(e2e.NewCommand(
-				"sudo", "alr", "--interactive=false", "remove", "ca-certificates",
-			)))
-
-			assert.NoError(t, r.Exec(e2e.NewCommand(
-				"sudo", "alr", "--interactive=false", "remove", "openssl",
-			)))
-
-			assert.NoError(t, r.Exec(e2e.NewCommand(
-				"alr", "fix",
-			)))
-
-			assert.NoError(t, r.Exec(e2e.NewCommand(
-				"sudo", "apt-get", "update",
-			)))
-
-			assert.NoError(t, r.Exec(e2e.NewCommand(
-				"sudo", "alr", "--interactive=false", "install", "ca-certificates",
-			)))
+			execShouldNoError(t, r, "alr", "--interactive=false", "remove", "ca-certificates")
+			execShouldNoError(t, r, "sudo", "alr", "--interactive=false", "remove", "openssl")
+			execShouldNoError(t, r, "alr", "fix")
+			execShouldNoError(t, r, "sudo", "apt-get", "update")
+			execShouldNoError(t, r, "sudo", "alr", "--interactive=false", "install", "ca-certificates")
 		},
 	)
 }

e2e-tests/issue_41_autoreq_skiplist_test.go

@@ -21,7 +21,6 @@ package e2etests_test
 import (
 	"testing"
 
-	"github.com/alecthomas/assert/v2"
 	"github.com/efficientgo/e2e"
 )
 
@@ -31,51 +30,11 @@ func TestE2EIssue41AutoreqSkiplist(t *testing.T) {
 		"issue-41-autoreq-skiplist",
 		AUTOREQ_AUTOPROV_SYSTEMS,
 		func(t *testing.T, r e2e.Runnable) {
-			err := r.Exec(e2e.NewCommand(
-				"sudo",
-				"alr",
-				"addrepo",
-				"--name",
-				"alr-repo",
-				"--url",
-				"https://gitea.plemya-x.ru/Maks1mS/repo-for-tests.git",
-			))
-			assert.NoError(t, err)
-
-			err = r.Exec(e2e.NewCommand(
-				"alr",
-				"ref",
-			))
-			assert.NoError(t, err)
-
-			err = r.Exec(e2e.NewCommand(
-				"alr",
-				"build",
-				"-p",
-				"alr-repo/test-autoreq-autoprov",
-			))
-			assert.NoError(t, err)
-
-			err = r.Exec(e2e.NewCommand(
-				"sh",
-				"-c",
-				"rpm -qp --requires *.rpm | grep \"^/bin/sh$\"",
-			))
-			assert.NoError(t, err)
-
-			err = r.Exec(e2e.NewCommand(
-				"sh",
-				"-c",
-				"rpm -qp --requires *.rpm | grep \"^/bin/bash$\"",
-			))
-			assert.Error(t, err)
-
-			err = r.Exec(e2e.NewCommand(
-				"sh",
-				"-c",
-				"rpm -qp --requires *.rpm | grep \"^/bin/zsh$\"",
-			))
-			assert.Error(t, err)
+			defaultPrepare(t, r)
+			execShouldNoError(t, r, "alr", "build", "-p", "alr-repo/test-autoreq-autoprov")
+			execShouldNoError(t, r, "sh", "-c", "rpm -qp --requires *.rpm | grep \"^/bin/sh$\"")
+			execShouldError(t, r, "sh", "-c", "rpm -qp --requires *.rpm | grep \"^/bin/bash$\"")
+			execShouldError(t, r, "sh", "-c", "rpm -qp --requires *.rpm | grep \"^/bin/zsh$\"")
 		},
 	)
 }

e2e-tests/issue_50_install_multiple_test.go

@@ -21,7 +21,6 @@ package e2etests_test
 import (
 	"testing"
 
-	"github.com/alecthomas/assert/v2"
 	"github.com/efficientgo/e2e"
 )
 
@@ -31,26 +30,10 @@ func TestE2EIssue50InstallMultiple(t *testing.T) {
 		"issue-50-install-multiple",
 		COMMON_SYSTEMS,
 		func(t *testing.T, r e2e.Runnable) {
-			err := r.Exec(e2e.NewCommand(
-				"sudo",
-				"alr",
-				"addrepo",
-				"--name",
-				"alr-repo",
-				"--url",
-				"https://gitea.plemya-x.ru/Maks1mS/repo-for-tests.git",
-			))
-			assert.NoError(t, err)
-
-			err = r.Exec(e2e.NewCommand(
-				"sudo", "alr", "in", "foo-pkg", "bar-pkg",
-			))
-			assert.NoError(t, err)
-
-			err = r.Exec(e2e.NewCommand("cat", "/opt/foo"))
-			assert.NoError(t, err)
-			err = r.Exec(e2e.NewCommand("cat", "/opt/bar"))
-			assert.NoError(t, err)
+			defaultPrepare(t, r)
+			execShouldNoError(t, r, "sudo", "alr", "in", "foo-pkg", "bar-pkg")
+			execShouldNoError(t, r, "cat", "/opt/foo")
+			execShouldNoError(t, r, "cat", "/opt/bar")
 		},
 	)
 }

e2e-tests/issue_53_lc_all_c_info_test.go

@@ -21,7 +21,6 @@ package e2etests_test
 import (
 	"testing"
 
-	"github.com/alecthomas/assert/v2"
 	"github.com/efficientgo/e2e"
 )
 
@@ -31,23 +30,8 @@ func TestE2EIssue53LcAllCInfo(t *testing.T) {
 		"issue-53-lc-all-c-info",
 		COMMON_SYSTEMS,
 		func(t *testing.T, r e2e.Runnable) {
-			err := r.Exec(e2e.NewCommand(
-				"sudo",
-				"alr",
-				"addrepo",
-				"--name",
-				"alr-repo",
-				"--url",
-				"https://gitea.plemya-x.ru/Plemya-x/alr-repo.git",
-			))
-			assert.NoError(t, err)
-
-			err = r.Exec(e2e.NewCommand(
-				"bash",
-				"-c",
-				"LANG=C alr info alr-bin",
-			))
-			assert.NoError(t, err)
+			defaultPrepare(t, r)
+			execShouldNoError(t, r, "bash", "-c", "LANG=C alr info foo-pkg")
 		},
 	)
 }

e2e-tests/issue_59_rm_completion_test.go

@@ -21,7 +21,6 @@ package e2etests_test
 import (
 	"testing"
 
-	"github.com/alecthomas/assert/v2"
 	"github.com/efficientgo/e2e"
 )
 
@@ -31,28 +30,11 @@ func TestE2EIssue59RmCompletion(t *testing.T) {
 		"issue-59-rm-completion",
 		COMMON_SYSTEMS,
 		func(t *testing.T, r e2e.Runnable) {
-			err := r.Exec(e2e.NewCommand(
-				"sudo",
-				"alr",
-				"addrepo",
-				"--name",
-				"alr-repo",
-				"--url",
-				"https://gitea.plemya-x.ru/Maks1mS/repo-for-tests.git",
-			))
-			assert.NoError(t, err)
-
-			err = r.Exec(e2e.NewCommand(
-				"sudo", "alr", "in", "foo-pkg", "bar-pkg",
-			))
-			assert.NoError(t, err)
-
-			err = r.Exec(e2e.NewCommand("sh", "-c", "alr rm --generate-bash-completion | grep ^foo-pkg$"))
-			assert.NoError(t, err)
-			err = r.Exec(e2e.NewCommand("sh", "-c", "alr rm --generate-bash-completion | grep ^bar-pkg$"))
-			assert.NoError(t, err)
-			err = r.Exec(e2e.NewCommand("sh", "-c", "alr rm --generate-bash-completion | grep ^test-autoreq-autoprov$"))
-			assert.Error(t, err)
+			defaultPrepare(t, r)
+			execShouldNoError(t, r, "sudo", "alr", "in", "foo-pkg", "bar-pkg")
+			execShouldNoError(t, r, "sh", "-c", "alr rm --generate-bash-completion | grep ^foo-pkg$")
+			execShouldNoError(t, r, "sh", "-c", "alr rm --generate-bash-completion | grep ^bar-pkg$")
+			execShouldError(t, r, "sh", "-c", "alr rm --generate-bash-completion | grep ^test-autoreq-autoprov$")
 		},
 	)
 }

e2e-tests/issue_72_install_with_deps_test.go

@@ -21,7 +21,6 @@ package e2etests_test
 import (
 	"testing"
 
-	"github.com/alecthomas/assert/v2"
 	"github.com/efficientgo/e2e"
 )
 
@@ -31,21 +30,8 @@ func TestE2EIssue72InstallWithDeps(t *testing.T) {
 		"issue-72-install-with-deps",
 		COMMON_SYSTEMS,
 		func(t *testing.T, r e2e.Runnable) {
-			err := r.Exec(e2e.NewCommand(
-				"sudo",
-				"alr",
-				"addrepo",
-				"--name",
-				"alr-repo",
-				"--url",
-				"https://gitea.plemya-x.ru/Maks1mS/repo-for-tests.git",
-			))
-			assert.NoError(t, err)
-
-			err = r.Exec(e2e.NewCommand(
-				"sudo", "alr", "in", "test-app-with-lib",
-			))
-			assert.NoError(t, err)
+			defaultPrepare(t, r)
+			execShouldNoError(t, r, "sudo", "alr", "in", "test-app-with-lib")
 		},
 	)
 }

e2e-tests/issue_74_upgradable_test.go

@@ -30,21 +30,14 @@ func TestE2EIssue74Upgradable(t *testing.T) {
 		"issue-74-upgradable",
 		COMMON_SYSTEMS,
 		func(t *testing.T, r e2e.Runnable) {
-			simpleExec(t, r, "sudo",
-				"alr",
-				"addrepo",
-				"--name",
-				"alr-repo",
-				"--url",
-				REPO_FOR_E2E_TESTS,
-			)
-			simpleExec(t, r, "sudo", "sh", "-c", "sed -i 's/ref = .*/ref = \"bd26236cd7\"/' /etc/alr/alr.toml")
-			simpleExec(t, r, "alr", "ref")
-			simpleExec(t, r, "sudo", "alr", "in", "bar-pkg")
-			simpleExec(t, r, "sh", "-c", "test $(alr list -U | wc -l) -eq 0 || exit 1")
-			simpleExec(t, r, "sudo", "sh", "-c", "sed -i 's/ref = .*/ref = \"d9a3541561\"/' /etc/alr/alr.toml")
-			simpleExec(t, r, "sudo", "alr", "ref")
-			simpleExec(t, r, "sh", "-c", "test $(alr list -U | wc -l) -eq 1 || exit 1")
+			defaultPrepare(t, r)
+			execShouldNoError(t, r, "sudo", "alr", "repo", "set-ref", "alr-repo", "bd26236cd7")
+			execShouldNoError(t, r, "alr", "ref")
+			execShouldNoError(t, r, "sudo", "alr", "in", "bar-pkg")
+			execShouldNoError(t, r, "sh", "-c", "test $(alr list -U | wc -l) -eq 0 || exit 1")
+			execShouldNoError(t, r, "sudo", "alr", "repo", "set-ref", "alr-repo", "d9a3541561")
+			execShouldNoError(t, r, "sudo", "alr", "ref")
+			execShouldNoError(t, r, "sh", "-c", "test $(alr list -U | wc -l) -eq 1 || exit 1")
 		},
 	)
 }

e2e-tests/issue_75_ref_specify_test.go

@@ -21,7 +21,6 @@ package e2etests_test
 import (
 	"testing"
 
-	"github.com/alecthomas/assert/v2"
 	"github.com/efficientgo/e2e"
 )
 
@@ -31,32 +30,9 @@ func TestE2EIssue75InstallWithDeps(t *testing.T) {
 		"issue-75-ref-specify",
 		COMMON_SYSTEMS,
 		func(t *testing.T, r e2e.Runnable) {
-			err := r.Exec(e2e.NewCommand(
-				"sudo",
-				"alr",
-				"addrepo",
-				"--name",
-				"alr-repo",
-				"--url",
-				"https://gitea.plemya-x.ru/Maks1mS/repo-for-tests.git",
-			))
-			assert.NoError(t, err)
-
-			err = r.Exec(e2e.NewCommand(
-				"sudo", "alr", "ref",
-			))
-			assert.NoError(t, err)
-
-			// TODO: replace with alr command when it be added
-			err = r.Exec(e2e.NewCommand(
-				"sudo", "sh", "-c", "sed -i 's/ref = .*/ref = \"bd26236cd7\"/' /etc/alr/alr.toml",
-			))
-			assert.NoError(t, err)
-
-			err = r.Exec(e2e.NewCommand(
-				"sh", "-c", "test $(alr list | wc -l) -eq 2 || exit 1",
-			))
-			assert.NoError(t, err)
+			defaultPrepare(t, r)
+			execShouldNoError(t, r, "sudo", "alr", "repo", "set-ref", "alr-repo", "bd26236cd7")
+			execShouldNoError(t, r, "sh", "-c", "test $(alr list | wc -l) -eq 2 || exit 1")
 		},
 	)
 }

e2e-tests/issue_81_multiple_packages_test.go

@@ -22,7 +22,6 @@ import (
 	"testing"
 
 	"github.com/efficientgo/e2e"
-	"github.com/stretchr/testify/assert"
 )
 
 func TestE2EIssue81MultiplePackages(t *testing.T) {
@@ -31,29 +30,9 @@ func TestE2EIssue81MultiplePackages(t *testing.T) {
 		"issue-81-multiple-packages",
 		COMMON_SYSTEMS,
 		func(t *testing.T, r e2e.Runnable) {
-			err := r.Exec(e2e.NewCommand(
-				"sudo",
-				"alr",
-				"addrepo",
-				"--name",
-				"alr-repo",
-				"--url",
-				REPO_FOR_E2E_TESTS,
-			))
-			assert.NoError(t, err)
-
-			err = r.Exec(e2e.NewCommand(
-				"sudo", "alr", "ref",
-			))
-			assert.NoError(t, err)
-
-			err = r.Exec(e2e.NewCommand(
-				"sudo", "alr", "in", "first-package-with-dashes",
-			))
-			assert.NoError(t, err)
-
-			err = r.Exec(e2e.NewCommand("cat", "/opt/first-package"))
-			assert.NoError(t, err)
+			defaultPrepare(t, r)
+			execShouldNoError(t, r, "sudo", "alr", "in", "first-package-with-dashes")
+			execShouldNoError(t, r, "cat", "/opt/first-package")
 		},
 	)
 }

e2e-tests/issue_91_set_repo_ref_test.go

@@ -0,0 +1,40 @@
+// ALR - Any Linux Repository
+// Copyright (C) 2025 The ALR Authors
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+//go:build e2e
+
+package e2etests_test
+
+import (
+	"testing"
+
+	"github.com/efficientgo/e2e"
+)
+
+func TestE2EIssue91MultiplePackages(t *testing.T) {
+	dockerMultipleRun(
+		t,
+		"issue-91-set-repo-ref",
+		COMMON_SYSTEMS,
+		func(t *testing.T, r e2e.Runnable) {
+			defaultPrepare(t, r)
+			execShouldError(t, r, "sudo", "alr", "repo", "set-ref")
+			execShouldError(t, r, "sudo", "alr", "repo", "set-ref", "alr-repo")
+			execShouldNoError(t, r, "sudo", "alr", "repo", "set-ref", "alr-repo", "bd26236cd7")
+			execShouldNoError(t, r, "sh", "-c", "test $(alr list | wc -l) -eq 2 || exit 1")
+		},
+	)
+}