Guest24897
/
DockerCLI
mirror of https://github.com/docker/cli.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

cli/command/container: TestSplitCpArg: cleaner skip 

Trying to make the logic slightly clearer, and adding a custom
message for the skip,

Before this:

    === RUN   TestSplitCpArg/absolute_path_with_drive
        cp_test.go:184: tc.os == "windows" && runtime.GOOS != "windows" || tc.os == "linux" && runtime.GOOS == "windows"

After this:

    === RUN   TestSplitCpArg/absolute_path_with_drive
	cp_test.go:184: skipping windows test on non-windows platform

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This commit is contained in:
Sebastiaan van Stijn 2024-07-04 12:49:40 +02:00
parent 5aae44baaa
commit 88896eeaab
No known key found for this signature in database
GPG Key ID: 76698F39D527CE8C
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
cli/command/container/cp_test.go
View File

@ -14,7 +14,6 @@ import (
"gotest.tools/v3/assert" "gotest.tools/v3/assert"
is "gotest.tools/v3/assert/cmp" is "gotest.tools/v3/assert/cmp"
"gotest.tools/v3/fs" "gotest.tools/v3/fs"
"gotest.tools/v3/skip"
) )
func TestRunCopyWithInvalidArguments(t *testing.T) { func TestRunCopyWithInvalidArguments(t *testing.T) {
@ -151,7 +150,7 @@ func TestSplitCpArg(t *testing.T) {
}{ }{
{ {
doc: "absolute path with colon", doc: "absolute path with colon",
os: "linux", os: "unix",
path: "/abs/path:withcolon", path: "/abs/path:withcolon",
expectedPath: "/abs/path:withcolon", expectedPath: "/abs/path:withcolon",
}, },
@ -181,7 +180,12 @@ func TestSplitCpArg(t *testing.T) {
for _, tc := range testcases { for _, tc := range testcases {
tc := tc tc := tc
t.Run(tc.doc, func(t *testing.T) { t.Run(tc.doc, func(t *testing.T) {
skip.If(t, tc.os == "windows" && runtime.GOOS != "windows" || tc.os == "linux" && runtime.GOOS == "windows") if tc.os == "windows" && runtime.GOOS != "windows" {
t.Skip("skipping windows test on non-windows platform")
}
if tc.os == "unix" && runtime.GOOS == "windows" {
t.Skip("skipping unix test on windows")
}
ctr, path := splitCpArg(tc.path) ctr, path := splitCpArg(tc.path)
assert.Check(t, is.Equal(tc.expectedContainer, ctr)) assert.Check(t, is.Equal(tc.expectedContainer, ctr))