beenull/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Add t.Helper() to the cli test helper functions

Browse source 
Signed-off-by: Djordje Lukic <djordje.lukic@docker.com>
This commit is contained in:
Djordje Lukic 2023-07-13 13:37:26 +02:00
parent 06b991f48f
commit cdac084fb4
No known key found for this signature in database
1 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
integration-cli/cli/cli.go
View file

@ -32,22 +32,26 @@ func DockerCmd(t testing.TB, args ...string) *icmd.Result {
// BuildCmd executes the specified docker build command and expect a success // BuildCmd executes the specified docker build command and expect a success
func BuildCmd(t testing.TB, name string, cmdOperators ...CmdOperator) *icmd.Result { func BuildCmd(t testing.TB, name string, cmdOperators ...CmdOperator) *icmd.Result {
t.Helper()
return Docker(Args("build", "-t", name), cmdOperators...).Assert(t, icmd.Success) return Docker(Args("build", "-t", name), cmdOperators...).Assert(t, icmd.Success)
} }
// InspectCmd executes the specified docker inspect command and expect a success // InspectCmd executes the specified docker inspect command and expect a success
func InspectCmd(t testing.TB, name string, cmdOperators ...CmdOperator) *icmd.Result { func InspectCmd(t testing.TB, name string, cmdOperators ...CmdOperator) *icmd.Result {
t.Helper()
return Docker(Args("inspect", name), cmdOperators...).Assert(t, icmd.Success) return Docker(Args("inspect", name), cmdOperators...).Assert(t, icmd.Success)
} }
// WaitRun will wait for the specified container to be running, maximum 5 seconds. // WaitRun will wait for the specified container to be running, maximum 5 seconds.
func WaitRun(t testing.TB, name string, cmdOperators ...CmdOperator) { func WaitRun(t testing.TB, name string, cmdOperators ...CmdOperator) {
t.Helper()
waitForInspectResult(t, name, "{{.State.Running}}", "true", 5*time.Second, cmdOperators...) waitForInspectResult(t, name, "{{.State.Running}}", "true", 5*time.Second, cmdOperators...)
} }
// WaitExited will wait for the specified container to state exit, subject // WaitExited will wait for the specified container to state exit, subject
// to a maximum time limit in seconds supplied by the caller // to a maximum time limit in seconds supplied by the caller
func WaitExited(t testing.TB, name string, timeout time.Duration, cmdOperators ...CmdOperator) { func WaitExited(t testing.TB, name string, timeout time.Duration, cmdOperators ...CmdOperator) {
t.Helper()
waitForInspectResult(t, name, "{{.State.Status}}", "exited", timeout, cmdOperators...) waitForInspectResult(t, name, "{{.State.Status}}", "exited", timeout, cmdOperators...)
} }