fix(tests): do all the path handling using filesystem.JoinPaths() BE-12828 (#2336)

This commit is contained in:
andres-portainer
2026-04-18 01:54:14 -03:00
committed by GitHub
parent 9d3f7b710d
commit 0b390dd274
27 changed files with 140 additions and 149 deletions
+5 -4
View File
@@ -12,6 +12,9 @@ import (
"sync"
"testing"
"github.com/portainer/portainer/api/filesystem"
"github.com/portainer/portainer/pkg/libstack"
"github.com/compose-spec/compose-go/v2/consts"
"github.com/compose-spec/compose-go/v2/types"
"github.com/docker/cli/cli/command"
@@ -21,9 +24,7 @@ import (
"github.com/docker/compose/v2/pkg/api"
"github.com/docker/compose/v2/pkg/compose"
"github.com/google/go-cmp/cmp"
"github.com/portainer/portainer/pkg/libstack"
zerolog "github.com/rs/zerolog/log"
"github.com/stretchr/testify/require"
)
@@ -161,7 +162,7 @@ services:
}
func createFile(t *testing.T, dir, fileName, content string) string {
filePath := filepath.Join(dir, fileName)
filePath := filesystem.JoinPaths(dir, fileName)
err := os.WriteFile(filePath, []byte(content), 0o644)
require.NoError(t, err)
@@ -1372,7 +1373,7 @@ func Test_CredentialsStore_Behavior(t *testing.T) {
"credsStore": "test-store",
"auths": {}
}`
configPath := filepath.Join(tmpDir, "config.json")
configPath := filesystem.JoinPaths(tmpDir, "config.json")
err := os.WriteFile(configPath, []byte(configJSON), 0644)
require.NoError(t, err)