Merge pull request #13154 from spowelljr/fixCopyFileWindows

Fix multinode file copying test on Windows
pull/13165/head
Steven Powell 2021-12-14 09:55:41 -08:00 committed by GitHub
commit c3f5295ba1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 2 deletions

View File

@ -27,6 +27,7 @@ import (
"net"
"os"
"os/exec"
"path"
"path/filepath"
"strings"
"testing"
@ -193,7 +194,7 @@ func validateCopyFileWithMultiNode(ctx context.Context, t *testing.T, profile st
// copy local to node
testCpCmd(ctx, t, profile, "", srcPath, n.Name, dstPath)
// copy back from node to lcoal
// copy back from node to local
tmpPath := filepath.Join(tmpDir, fmt.Sprintf("cp-test_%s.txt", n.Name))
testCpCmd(ctx, t, profile, n.Name, dstPath, "", tmpPath)
@ -202,7 +203,7 @@ func validateCopyFileWithMultiNode(ctx context.Context, t *testing.T, profile st
if n.Name == n2.Name {
continue
}
fp := filepath.Join("/home/docker", fmt.Sprintf("cp-test_%s_%s.txt", n.Name, n2.Name))
fp := path.Join("/home/docker", fmt.Sprintf("cp-test_%s_%s.txt", n.Name, n2.Name))
testCpCmd(ctx, t, profile, n.Name, dstPath, n2.Name, fp)
}
}