2017-08-01 05:06:47 -04:00
|
|
|
package network
|
|
|
|
|
|
|
|
import (
|
2018-05-03 21:02:44 -04:00
|
|
|
"context"
|
2022-02-25 07:12:19 -05:00
|
|
|
"io"
|
2017-12-21 16:27:57 -05:00
|
|
|
"testing"
|
2017-08-01 05:06:47 -04:00
|
|
|
|
|
|
|
"github.com/docker/cli/internal/test"
|
2023-10-23 08:51:01 -04:00
|
|
|
"github.com/docker/cli/internal/test/builders"
|
2017-08-01 05:06:47 -04:00
|
|
|
"github.com/docker/docker/api/types/filters"
|
2024-06-04 03:17:20 -04:00
|
|
|
"github.com/docker/docker/api/types/network"
|
2017-12-21 16:27:57 -05:00
|
|
|
"github.com/google/go-cmp/cmp"
|
2017-08-01 05:06:47 -04:00
|
|
|
"github.com/pkg/errors"
|
2020-02-22 12:12:14 -05:00
|
|
|
"gotest.tools/v3/assert"
|
|
|
|
is "gotest.tools/v3/assert/cmp"
|
|
|
|
"gotest.tools/v3/golden"
|
2017-08-01 05:06:47 -04:00
|
|
|
)
|
|
|
|
|
|
|
|
func TestNetworkListErrors(t *testing.T) {
|
|
|
|
testCases := []struct {
|
2024-06-05 10:28:24 -04:00
|
|
|
networkListFunc func(ctx context.Context, options network.ListOptions) ([]network.Summary, error)
|
2017-08-01 05:06:47 -04:00
|
|
|
expectedError string
|
|
|
|
}{
|
|
|
|
{
|
2024-06-05 10:28:24 -04:00
|
|
|
networkListFunc: func(ctx context.Context, options network.ListOptions) ([]network.Summary, error) {
|
|
|
|
return []network.Summary{}, errors.Errorf("error creating network")
|
2017-08-01 05:06:47 -04:00
|
|
|
},
|
|
|
|
expectedError: "error creating network",
|
|
|
|
},
|
|
|
|
}
|
|
|
|
|
|
|
|
for _, tc := range testCases {
|
|
|
|
cmd := newListCommand(
|
|
|
|
test.NewFakeCli(&fakeClient{
|
|
|
|
networkListFunc: tc.networkListFunc,
|
|
|
|
}),
|
|
|
|
)
|
2022-02-25 07:12:19 -05:00
|
|
|
cmd.SetOut(io.Discard)
|
test spring-cleaning
This makes a quick pass through our tests;
Discard output/err
----------------------------------------------
Many tests were testing for error-conditions, but didn't discard output.
This produced a lot of noise when running the tests, and made it hard
to discover if there were actual failures, or if the output was expected.
For example:
=== RUN TestConfigCreateErrors
Error: "create" requires exactly 2 arguments.
See 'create --help'.
Usage: create [OPTIONS] CONFIG file|- [flags]
Create a config from a file or STDIN
Error: "create" requires exactly 2 arguments.
See 'create --help'.
Usage: create [OPTIONS] CONFIG file|- [flags]
Create a config from a file or STDIN
Error: error creating config
--- PASS: TestConfigCreateErrors (0.00s)
And after discarding output:
=== RUN TestConfigCreateErrors
--- PASS: TestConfigCreateErrors (0.00s)
Use sub-tests where possible
----------------------------------------------
Some tests were already set-up to use test-tables, and even had a usable
name (or in some cases "error" to check for). Change them to actual sub-
tests. Same test as above, but now with sub-tests and output discarded:
=== RUN TestConfigCreateErrors
=== RUN TestConfigCreateErrors/requires_exactly_2_arguments
=== RUN TestConfigCreateErrors/requires_exactly_2_arguments#01
=== RUN TestConfigCreateErrors/error_creating_config
--- PASS: TestConfigCreateErrors (0.00s)
--- PASS: TestConfigCreateErrors/requires_exactly_2_arguments (0.00s)
--- PASS: TestConfigCreateErrors/requires_exactly_2_arguments#01 (0.00s)
--- PASS: TestConfigCreateErrors/error_creating_config (0.00s)
PASS
It's not perfect in all cases (in the above, there's duplicate "expected"
errors, but Go conveniently adds "#01" for the duplicate). There's probably
also various tests I missed that could still use the same changes applied;
we can improve these in follow-ups.
Set cmd.Args to prevent test-failures
----------------------------------------------
When running tests from my IDE, it compiles the tests before running,
then executes the compiled binary to run the tests. Cobra doesn't like
that, because in that situation `os.Args` is taken as argument for the
command that's executed. The command that's tested now sees the test-
flags as arguments (`-test.v -test.run ..`), which causes various tests
to fail ("Command XYZ does not accept arguments").
# compile the tests:
go test -c -o foo.test
# execute the test:
./foo.test -test.v -test.run TestFoo
=== RUN TestFoo
Error: "foo" accepts no arguments.
The Cobra maintainers ran into the same situation, and for their own
use have added a special case to ignore `os.Args` in these cases;
https://github.com/spf13/cobra/blob/v1.8.1/command.go#L1078-L1083
args := c.args
// Workaround FAIL with "go test -v" or "cobra.test -test.v", see #155
if c.args == nil && filepath.Base(os.Args[0]) != "cobra.test" {
args = os.Args[1:]
}
Unfortunately, that exception is too specific (only checks for `cobra.test`),
so doesn't automatically fix the issue for other test-binaries. They did
provide a `cmd.SetArgs()` utility for this purpose
https://github.com/spf13/cobra/blob/v1.8.1/command.go#L276-L280
// SetArgs sets arguments for the command. It is set to os.Args[1:] by default, if desired, can be overridden
// particularly useful when testing.
func (c *Command) SetArgs(a []string) {
c.args = a
}
And the fix is to explicitly set the command's args to an empty slice to
prevent Cobra from falling back to using `os.Args[1:]` as arguments.
cmd := newSomeThingCommand()
cmd.SetArgs([]string{})
Some tests already take this issue into account, and I updated some tests
for this, but there's likely many other ones that can use the same treatment.
Perhaps the Cobra maintainers would accept a contribution to make their
condition less specific and to look for binaries ending with a `.test`
suffix (which is what compiled binaries usually are named as).
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit ab230240ad44fdffa03558a3dbb47971f6336911)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2024-07-03 19:29:04 -04:00
|
|
|
cmd.SetErr(io.Discard)
|
2017-12-21 16:27:57 -05:00
|
|
|
assert.ErrorContains(t, cmd.Execute(), tc.expectedError)
|
2017-08-01 05:06:47 -04:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2018-08-01 17:16:28 -04:00
|
|
|
func TestNetworkList(t *testing.T) {
|
|
|
|
testCases := []struct {
|
|
|
|
doc string
|
2024-06-05 10:28:24 -04:00
|
|
|
networkListFunc func(ctx context.Context, options network.ListOptions) ([]network.Summary, error)
|
2018-08-01 17:16:28 -04:00
|
|
|
flags map[string]string
|
|
|
|
golden string
|
|
|
|
}{
|
|
|
|
{
|
|
|
|
doc: "network list with flags",
|
|
|
|
flags: map[string]string{
|
|
|
|
"filter": "image.name=ubuntu",
|
|
|
|
},
|
|
|
|
golden: "network-list.golden",
|
2024-06-05 10:28:24 -04:00
|
|
|
networkListFunc: func(ctx context.Context, options network.ListOptions) ([]network.Summary, error) {
|
2024-06-04 03:17:20 -04:00
|
|
|
expectedOpts := network.ListOptions{
|
2018-08-01 17:16:28 -04:00
|
|
|
Filters: filters.NewArgs(filters.Arg("image.name", "ubuntu")),
|
|
|
|
}
|
|
|
|
assert.Check(t, is.DeepEqual(expectedOpts, options, cmp.AllowUnexported(filters.Args{})))
|
2017-08-01 05:06:47 -04:00
|
|
|
|
2024-06-05 10:28:24 -04:00
|
|
|
return []network.Summary{*builders.NetworkResource(builders.NetworkResourceID("123454321"),
|
2023-10-23 08:51:01 -04:00
|
|
|
builders.NetworkResourceName("network_1"),
|
|
|
|
builders.NetworkResourceDriver("09.7.01"),
|
|
|
|
builders.NetworkResourceScope("global"))}, nil
|
2018-08-01 17:16:28 -04:00
|
|
|
},
|
2017-08-01 05:06:47 -04:00
|
|
|
},
|
2018-08-01 17:16:28 -04:00
|
|
|
{
|
|
|
|
doc: "network list sort order",
|
|
|
|
flags: map[string]string{
|
|
|
|
"format": "{{ .Name }}",
|
|
|
|
},
|
|
|
|
golden: "network-list-sort.golden",
|
2024-06-05 10:28:24 -04:00
|
|
|
networkListFunc: func(ctx context.Context, options network.ListOptions) ([]network.Summary, error) {
|
|
|
|
return []network.Summary{
|
2023-10-23 08:51:01 -04:00
|
|
|
*builders.NetworkResource(builders.NetworkResourceName("network-2-foo")),
|
|
|
|
*builders.NetworkResource(builders.NetworkResourceName("network-1-foo")),
|
|
|
|
*builders.NetworkResource(builders.NetworkResourceName("network-10-foo")),
|
2022-09-29 11:21:51 -04:00
|
|
|
}, nil
|
2018-08-01 17:16:28 -04:00
|
|
|
},
|
2018-08-01 14:40:41 -04:00
|
|
|
},
|
2018-08-01 17:16:28 -04:00
|
|
|
}
|
2018-08-01 14:40:41 -04:00
|
|
|
|
2018-08-01 17:16:28 -04:00
|
|
|
for _, tc := range testCases {
|
test spring-cleaning
This makes a quick pass through our tests;
Discard output/err
----------------------------------------------
Many tests were testing for error-conditions, but didn't discard output.
This produced a lot of noise when running the tests, and made it hard
to discover if there were actual failures, or if the output was expected.
For example:
=== RUN TestConfigCreateErrors
Error: "create" requires exactly 2 arguments.
See 'create --help'.
Usage: create [OPTIONS] CONFIG file|- [flags]
Create a config from a file or STDIN
Error: "create" requires exactly 2 arguments.
See 'create --help'.
Usage: create [OPTIONS] CONFIG file|- [flags]
Create a config from a file or STDIN
Error: error creating config
--- PASS: TestConfigCreateErrors (0.00s)
And after discarding output:
=== RUN TestConfigCreateErrors
--- PASS: TestConfigCreateErrors (0.00s)
Use sub-tests where possible
----------------------------------------------
Some tests were already set-up to use test-tables, and even had a usable
name (or in some cases "error" to check for). Change them to actual sub-
tests. Same test as above, but now with sub-tests and output discarded:
=== RUN TestConfigCreateErrors
=== RUN TestConfigCreateErrors/requires_exactly_2_arguments
=== RUN TestConfigCreateErrors/requires_exactly_2_arguments#01
=== RUN TestConfigCreateErrors/error_creating_config
--- PASS: TestConfigCreateErrors (0.00s)
--- PASS: TestConfigCreateErrors/requires_exactly_2_arguments (0.00s)
--- PASS: TestConfigCreateErrors/requires_exactly_2_arguments#01 (0.00s)
--- PASS: TestConfigCreateErrors/error_creating_config (0.00s)
PASS
It's not perfect in all cases (in the above, there's duplicate "expected"
errors, but Go conveniently adds "#01" for the duplicate). There's probably
also various tests I missed that could still use the same changes applied;
we can improve these in follow-ups.
Set cmd.Args to prevent test-failures
----------------------------------------------
When running tests from my IDE, it compiles the tests before running,
then executes the compiled binary to run the tests. Cobra doesn't like
that, because in that situation `os.Args` is taken as argument for the
command that's executed. The command that's tested now sees the test-
flags as arguments (`-test.v -test.run ..`), which causes various tests
to fail ("Command XYZ does not accept arguments").
# compile the tests:
go test -c -o foo.test
# execute the test:
./foo.test -test.v -test.run TestFoo
=== RUN TestFoo
Error: "foo" accepts no arguments.
The Cobra maintainers ran into the same situation, and for their own
use have added a special case to ignore `os.Args` in these cases;
https://github.com/spf13/cobra/blob/v1.8.1/command.go#L1078-L1083
args := c.args
// Workaround FAIL with "go test -v" or "cobra.test -test.v", see #155
if c.args == nil && filepath.Base(os.Args[0]) != "cobra.test" {
args = os.Args[1:]
}
Unfortunately, that exception is too specific (only checks for `cobra.test`),
so doesn't automatically fix the issue for other test-binaries. They did
provide a `cmd.SetArgs()` utility for this purpose
https://github.com/spf13/cobra/blob/v1.8.1/command.go#L276-L280
// SetArgs sets arguments for the command. It is set to os.Args[1:] by default, if desired, can be overridden
// particularly useful when testing.
func (c *Command) SetArgs(a []string) {
c.args = a
}
And the fix is to explicitly set the command's args to an empty slice to
prevent Cobra from falling back to using `os.Args[1:]` as arguments.
cmd := newSomeThingCommand()
cmd.SetArgs([]string{})
Some tests already take this issue into account, and I updated some tests
for this, but there's likely many other ones that can use the same treatment.
Perhaps the Cobra maintainers would accept a contribution to make their
condition less specific and to look for binaries ending with a `.test`
suffix (which is what compiled binaries usually are named as).
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit ab230240ad44fdffa03558a3dbb47971f6336911)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2024-07-03 19:29:04 -04:00
|
|
|
tc := tc
|
2018-08-01 17:16:28 -04:00
|
|
|
t.Run(tc.doc, func(t *testing.T) {
|
|
|
|
cli := test.NewFakeCli(&fakeClient{networkListFunc: tc.networkListFunc})
|
|
|
|
cmd := newListCommand(cli)
|
|
|
|
for key, value := range tc.flags {
|
2023-10-23 08:51:01 -04:00
|
|
|
assert.Check(t, cmd.Flags().Set(key, value))
|
2018-08-01 17:16:28 -04:00
|
|
|
}
|
|
|
|
assert.NilError(t, cmd.Execute())
|
|
|
|
golden.Assert(t, cli.OutBuffer().String(), tc.golden)
|
|
|
|
})
|
|
|
|
}
|
2018-08-01 14:40:41 -04:00
|
|
|
}
|