Skip to content

Commit e008e8f

Browse files
sebrandon1praveenkumar
authored andcommitted
Fix another duplicate import
1 parent aaff394 commit e008e8f

1 file changed

Lines changed: 6 additions & 7 deletions

File tree

test/e2e/testsuite/testsuite.go

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ import (
1818
"github.com/crc-org/crc/v2/pkg/crc/machine"
1919
"github.com/crc-org/crc/v2/pkg/crc/preset"
2020
"github.com/crc-org/crc/v2/pkg/crc/version"
21-
"github.com/crc-org/crc/v2/test/extended/crc/cmd"
2221
crcCmd "github.com/crc-org/crc/v2/test/extended/crc/cmd"
2322
"github.com/crc-org/crc/v2/test/extended/util"
2423
"github.com/cucumber/godog"
@@ -1026,16 +1025,16 @@ func ExecutingPodmanCommandSucceedsFails(command string, expected string) error
10261025

10271026
var err error
10281027
if expected == "succeeds" {
1029-
_, err = cmd.RunPodmanExpectSuccess(strings.Split(command[1:len(command)-1], " ")...)
1028+
_, err = crcCmd.RunPodmanExpectSuccess(strings.Split(command[1:len(command)-1], " ")...)
10301029
} else if expected == "fails" {
1031-
_, err = cmd.RunPodmanExpectFail(strings.Split(command[1:len(command)-1], " ")...)
1030+
_, err = crcCmd.RunPodmanExpectFail(strings.Split(command[1:len(command)-1], " ")...)
10321031
}
10331032

10341033
return err
10351034
}
10361035

10371036
func PullLoginTagPushImageSucceeds(image string) error {
1038-
_, err := cmd.RunPodmanExpectSuccess("pull", image)
1037+
_, err := crcCmd.RunPodmanExpectSuccess("pull", image)
10391038
if err != nil {
10401039
return err
10411040
}
@@ -1047,17 +1046,17 @@ func PullLoginTagPushImageSucceeds(image string) error {
10471046

10481047
token := util.GetLastCommandOutput("stdout")
10491048
fmt.Println(token)
1050-
_, err = cmd.RunPodmanExpectSuccess("login", "-u", "kubeadmin", "-p", token, "default-route-openshift-image-registry.apps-crc.testing", "--tls-verify=false") // $(oc whoami -t)
1049+
_, err = crcCmd.RunPodmanExpectSuccess("login", "-u", "kubeadmin", "-p", token, "default-route-openshift-image-registry.apps-crc.testing", "--tls-verify=false") // $(oc whoami -t)
10511050
if err != nil {
10521051
return err
10531052
}
10541053

1055-
_, err = cmd.RunPodmanExpectSuccess("tag", image, "default-route-openshift-image-registry.apps-crc.testing/testproj/hello:test")
1054+
_, err = crcCmd.RunPodmanExpectSuccess("tag", image, "default-route-openshift-image-registry.apps-crc.testing/testproj/hello:test")
10561055
if err != nil {
10571056
return err
10581057
}
10591058

1060-
_, err = cmd.RunPodmanExpectSuccess("push", "default-route-openshift-image-registry.apps-crc.testing/testproj/hello:test", "--remove-signatures", "--tls-verify=false")
1059+
_, err = crcCmd.RunPodmanExpectSuccess("push", "default-route-openshift-image-registry.apps-crc.testing/testproj/hello:test", "--remove-signatures", "--tls-verify=false")
10611060
if err != nil {
10621061
return err
10631062
}

0 commit comments

Comments
 (0)