Address testrunner and lo changes.

Author: loreto

internal/devconfig/config.go

@@ -14,6 +14,7 @@ import (
 
 	"github.com/pkg/errors"
 	"github.com/samber/lo"
+	"github.com/samber/lo/mutable"
 	"go.jetify.com/devbox/internal/build"
 	"go.jetify.com/devbox/internal/cachehash"
 	"go.jetify.com/devbox/internal/devbox/shellcmd"
@@ -333,10 +334,14 @@ func (c *Config) Packages(
 	}
 
 	// Keep only the last occurrence of each package (by name).
-	return lo.Reverse(lo.UniqBy(
-		lo.Reverse(packages),
+	mutable.Reverse(packages)
+	packages = lo.UniqBy(
+		packages,
 		func(p configfile.Package) string { return p.Name },
-	))
+	)
+	mutable.Reverse(packages)
+
+	return packages
 }
 
 func (c *Config) NixPkgsCommitHash() string {

testscripts/testrunner/testrunner.go

@@ -15,18 +15,17 @@ import (
 	"go.jetify.com/devbox/internal/boxcli"
 )
 
-func Main(m *testing.M) int {
-	commands := map[string]func() int{
-		"devbox": func() int {
+func Main(m *testing.M) {
+	commands := map[string]func(){
+		"devbox": func() {
 			// Call the devbox CLI directly:
-			return boxcli.Execute(context.Background(), os.Args[1:])
+			boxcli.Execute(context.Background(), os.Args[1:])
 		},
-		"print": func() int { // Not 'echo' because we don't expand variables
+		"print": func() { // Not 'echo' because we don't expand variables
 			fmt.Println(strings.Join(os.Args[1:], " "))
-			return 0
 		},
 	}
-	return testscript.RunMain(m, commands)
+	testscript.Main(m, commands)
 }
 
 func RunTestscripts(t *testing.T, testscriptsDir string) {

testscripts/testscripts_test.go

@@ -19,7 +19,7 @@ func TestScripts(t *testing.T) {
 }
 
 func TestMain(m *testing.M) {
-	os.Exit(testrunner.Main(m))
+	testrunner.Main(m)
 }
 
 // TestExamples runs testscripts on the devbox-projects in the examples folder.