Skip to content

Commit

Permalink
Change cmd to use run instead of output
Browse files Browse the repository at this point in the history
  • Loading branch information
kylewuolle committed Nov 22, 2024
1 parent 6ce9aa8 commit 015cb37
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 5 deletions.
4 changes: 1 addition & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -139,9 +139,7 @@ test-e2e: cli-install
@if [ "$$GINKGO_LABEL_FILTER" ]; then \
ginkgo_label_flag="-ginkgo.label-filter=$$GINKGO_LABEL_FILTER"; \
fi; \
KIND_CLUSTER_NAME="hmc-test" KIND_VERSION=$(KIND_VERSION) dlv test ./test/e2e/ --headless -l :2345 --only-same-user=false --log --api-version=2 --accept-multiclient -- -ginkgo.v

#KIND_CLUSTER_NAME="hmc-test" KIND_VERSION=$(KIND_VERSION) go test ./test/e2e/ -v -ginkgo.v -ginkgo.timeout=3h -timeout=3h $$ginkgo_label_flag
KIND_CLUSTER_NAME="hmc-test" KIND_VERSION=$(KIND_VERSION) go test ./test/e2e/ -v -ginkgo.v -ginkgo.timeout=3h -timeout=3h $$ginkgo_label_flag

.PHONY: lint
lint: golangci-lint ## Run golangci-lint linter & yamllint
Expand Down
4 changes: 2 additions & 2 deletions test/utils/utils.go
Original file line number Diff line number Diff line change
Expand Up @@ -41,12 +41,12 @@ func Run(cmd *exec.Cmd) ([]byte, error) {
cmd.Stdout = GinkgoWriter
cmd.Stderr = GinkgoWriter

output, err := cmd.Output()
err := cmd.Run()
if err != nil {
return nil, handleCmdError(err, command)
}

return output, nil
return nil, nil
}

func handleCmdError(err error, command string) error {
Expand Down

0 comments on commit 015cb37

Please sign in to comment.