From 05267e9e8c214d7e69a164151fc328ffb3522bbc Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Sun, 21 Jan 2024 20:32:02 +0100 Subject: [PATCH] integration-cli: TestInspectAPIBridgeNetworkSettings121: use current version This test was added in f301c5765a0d7f4b6866cedfdface6f87874ff53 to test inspect output for API > v1.21, however, it was pinned to API v1.21, which is now deprecated. Remove the fixed version, as the intent was to test "current" API versions (API v1.21 and up), Signed-off-by: Sebastiaan van Stijn (cherry picked from commit 13a384a6fa328f80b3d35bea106e3a5fbd516e8b) Signed-off-by: Sebastiaan van Stijn --- integration-cli/docker_api_inspect_test.go | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/integration-cli/docker_api_inspect_test.go b/integration-cli/docker_api_inspect_test.go index c8f410d366..e058e7f64a 100644 --- a/integration-cli/docker_api_inspect_test.go +++ b/integration-cli/docker_api_inspect_test.go @@ -159,6 +159,11 @@ func (s *DockerAPISuite) TestInspectAPIBridgeNetworkSettings120(c *testing.T) { assert.Assert(c, len(settings.IPAddress) != 0) } +// Inspect for API v1.21 and up; see +// +// - https://github.com/moby/moby/issues/17131 +// - https://github.com/moby/moby/issues/17139 +// - https://github.com/moby/moby/issues/17173 func (s *DockerAPISuite) TestInspectAPIBridgeNetworkSettings121(c *testing.T) { // Windows doesn't have any bridge network settings testRequires(c, DaemonIsLinux) @@ -166,7 +171,7 @@ func (s *DockerAPISuite) TestInspectAPIBridgeNetworkSettings121(c *testing.T) { containerID := strings.TrimSpace(out) cli.WaitRun(c, containerID) - body := getInspectBody(c, "v1.21", containerID) + body := getInspectBody(c, "", containerID) var inspectJSON types.ContainerJSON err := json.Unmarshal(body, &inspectJSON)