Skip to content

Commit

Permalink
Merge pull request #45958 from rumpl/24.0_backport_cli-test-helper
Browse files Browse the repository at this point in the history
[24.0 backport] integration-cli: Add t.Helper() to the cli test helper functions
  • Loading branch information
thaJeztah committed Jul 13, 2023
2 parents 661fe9f + 6c5144d commit 08321a0
Showing 1 changed file with 4 additions and 0 deletions.
4 changes: 4 additions & 0 deletions integration-cli/cli/cli.go
Original file line number Diff line number Diff line change
Expand Up @@ -32,22 +32,26 @@ func DockerCmd(t testing.TB, args ...string) *icmd.Result {

// BuildCmd executes the specified docker build command and expect a success
func BuildCmd(t testing.TB, name string, cmdOperators ...CmdOperator) *icmd.Result {
t.Helper()
return Docker(Args("build", "-t", name), cmdOperators...).Assert(t, icmd.Success)
}

// InspectCmd executes the specified docker inspect command and expect a success
func InspectCmd(t testing.TB, name string, cmdOperators ...CmdOperator) *icmd.Result {
t.Helper()
return Docker(Args("inspect", name), cmdOperators...).Assert(t, icmd.Success)
}

// WaitRun will wait for the specified container to be running, maximum 5 seconds.
func WaitRun(t testing.TB, name string, cmdOperators ...CmdOperator) {
t.Helper()
waitForInspectResult(t, name, "{{.State.Running}}", "true", 5*time.Second, cmdOperators...)
}

// WaitExited will wait for the specified container to state exit, subject
// to a maximum time limit in seconds supplied by the caller
func WaitExited(t testing.TB, name string, timeout time.Duration, cmdOperators ...CmdOperator) {
t.Helper()
waitForInspectResult(t, name, "{{.State.Status}}", "exited", timeout, cmdOperators...)
}

Expand Down

0 comments on commit 08321a0

Please sign in to comment.