From d57175aa2e42c2e5d4cc14bf0d66d5779ccd1617 Mon Sep 17 00:00:00 2001 From: Ian Campbell Date: Fri, 26 Apr 2019 10:37:26 +0100 Subject: [PATCH] Move subtests of TestGlobalHelp into actual subtests Signed-off-by: Ian Campbell --- e2e/cli-plugins/help_test.go | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/e2e/cli-plugins/help_test.go b/e2e/cli-plugins/help_test.go index 8e57ccc876..f023b0f2f1 100644 --- a/e2e/cli-plugins/help_test.go +++ b/e2e/cli-plugins/help_test.go @@ -74,18 +74,22 @@ func TestGlobalHelp(t *testing.T) { assert.Assert(t, is.Equal(badmetacount, 1)) // Running with `--help` should produce the same. - res2 := icmd.RunCmd(run("--help")) - res2.Assert(t, icmd.Expected{ - ExitCode: 0, + t.Run("help_flag", func(t *testing.T) { + res2 := icmd.RunCmd(run("--help")) + res2.Assert(t, icmd.Expected{ + ExitCode: 0, + }) + assert.Assert(t, is.Equal(res2.Stdout(), res.Stdout())) + assert.Assert(t, is.Equal(res2.Stderr(), "")) }) - assert.Assert(t, is.Equal(res2.Stdout(), res.Stdout())) - assert.Assert(t, is.Equal(res2.Stderr(), "")) // Running just `docker` (without `help` nor `--help`) should produce the same thing, except on Stderr. - res2 = icmd.RunCmd(run()) - res2.Assert(t, icmd.Expected{ - ExitCode: 0, + t.Run("bare", func(t *testing.T) { + res2 := icmd.RunCmd(run()) + res2.Assert(t, icmd.Expected{ + ExitCode: 0, + }) + assert.Assert(t, is.Equal(res2.Stdout(), "")) + assert.Assert(t, is.Equal(res2.Stderr(), res.Stdout())) }) - assert.Assert(t, is.Equal(res2.Stdout(), "")) - assert.Assert(t, is.Equal(res2.Stderr(), res.Stdout())) }