github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Merge pull request #6568 from katiewasnothere/cri_integration_tests_windows

Browse Source 
Update TestContainerSymlinkVolumes to use windows path
This commit is contained in:
Phil Estes 2022-03-03 10:19:56 -05:00 committed by GitHub
commit ab2f7dcdbc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
integration/container_volume_test.go
View File

@ -19,6 +19,7 @@ package integration
import ( import (
"os" "os"
"path/filepath" "path/filepath"
goruntime "runtime"
"testing" "testing"
"time" "time"
@ -105,17 +106,22 @@ func TestContainerSymlinkVolumes(t *testing.T) {
var ( var (
testImage = GetImage(BusyBox) testImage = GetImage(BusyBox)
containerName = "test-container" containerName = "test-container"
containerMountPath = "/mounted_file"
) )
if goruntime.GOOS == "windows" {
containerMountPath = filepath.Clean("C:" + containerMountPath)
}
EnsureImageExists(t, testImage) EnsureImageExists(t, testImage)
t.Log("Create a container with a symlink volume mount") t.Log("Create a container with a symlink volume mount")
cnConfig := ContainerConfig( cnConfig := ContainerConfig(
containerName, containerName,
testImage, testImage,
WithCommand("cat", "/mounted_file"), WithCommand("cat", containerMountPath),
WithLogPath(containerName), WithLogPath(containerName),
WithVolumeMount(file, "/mounted_file"), WithVolumeMount(file, containerMountPath),
) )
cn, err := runtimeService.CreateContainer(sb, cnConfig, sbConfig) cn, err := runtimeService.CreateContainer(sb, cnConfig, sbConfig)