Cory Snider
1fc4e13cc5
matchesType tests a network against only the first value of the type filter. The values come from a map. Their order is random and changes from one network to the next. A GET /networks request that filters on both type=builtin and type=custom lists a random subset of the networks. Before networks were filtered one at a time, the daemon filtered the list once for each type value and listed every network that matched any of them. Match a network when its type is any of the filter's values. integration-cli's TestDockerNetworkLsFilter checks this request but is skipped in every run. Its OnlyDefaultNetworks requirement is met only when GET /networks lists no networks at all. The daemon always lists the predefined bridge, host and none networks. Port the test to integration/network as TestNetworkListFilters, which uses the API client. The new test checks the same id, name, type, label and driver filter terms against two networks that it creates and the predefined networks. It derives the expected results for type=custom and driver=bridge from the unfiltered list, as the daemon can have other networks. Remove the integration-cli test, its assertNwList helper and the OnlyDefaultNetworks requirement. Nothing else uses them. Add the combined type values to the filter unit test as well. Both tests fail on the combined values without the fix. Signed-off-by: Cory Snider <csnider@mirantis.com>