@@ -2,8 +2,8 @@ package main
22
33import (
44 "context"
5+ "errors"
56 "fmt"
6- tests2 "github.com/jfrog/jfrog-cli-artifactory/utils/tests"
77 "os"
88 "os/exec"
99 "path"
@@ -12,6 +12,8 @@ import (
1212 "testing"
1313 "time"
1414
15+ tests2 "github.com/jfrog/jfrog-cli-artifactory/utils/tests"
16+
1517 "github.com/docker/docker/api/types/mount"
1618
1719 biutils "github.com/jfrog/build-info-go/utils"
@@ -601,17 +603,23 @@ func TestNativeDockerFlagParsing(t *testing.T) {
601603 defer cleanup ()
602604
603605 dockerTestCases := []struct {
604- name string
605- args []string
606+ name string
607+ args []string
608+ expectedErr error
606609 }{
607- {"docker" , []string {"docker" }},
608- {"docker version" , []string {"docker" , "version" }},
609- {"docker scan" , []string {"docker" , "scan" } },
610- {"cli flags after args" , []string {"docker" , "version" , "--build-name=d" , "--build-number=1" , "--module=1" }},
611- {"cli flags before args" , []string {"docker" , "--build-name=d" , "--build-number=1" , "--module=1" , "version" }},
610+ {"docker" , []string {"docker" }, nil },
611+ {"docker version" , []string {"docker" , "version" }, nil },
612+ {"docker scan" , []string {"docker" , "scan" , "--min-severity=low" }, errors . New ( "a docker image name must be provided" ) },
613+ {"cli flags after args" , []string {"docker" , "version" , "--build-name=d" , "--build-number=1" , "--module=1" }, nil },
614+ {"cli flags before args" , []string {"docker" , "--build-name=d" , "--build-number=1" , "--module=1" , "version" }, nil },
612615 }
613616 for _ , testCase := range dockerTestCases {
614617 t .Run (testCase .name , func (t * testing.T ) {
618+ if testCase .expectedErr != nil {
619+ err := runJfrogCliWithoutAssertion (testCase .args ... )
620+ assert .EqualError (t , err , testCase .expectedErr .Error ())
621+ return
622+ }
615623 runCmdWithRetries (t , jfCliTask (testCase .args ... ))
616624 })
617625 }
0 commit comments