InTheForest/moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2026-01-11 18:51:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

client/container_update: Wrap options and result

Browse Source 
Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com>
This commit is contained in:
Paweł Gronowski
2025-10-29 12:13:02 +01:00
parent c755b9635d
commit 38d703ff6f
7 changed files with 68 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
integration/container/update_linux_test.go
View File

@@ -37,8 +37,8 @@ func TestUpdateMemory(t *testing.T) {
setMemorySwap int64 = 524288000
)
_, err := apiClient.ContainerUpdate(ctx, cID, containertypes.UpdateConfig{
Resources: containertypes.Resources{
_, err := apiClient.ContainerUpdate(ctx, cID, client.ContainerUpdateOptions{
Resources: &containertypes.Resources{
Memory: setMemory,
MemorySwap: setMemorySwap,
},
@@ -100,16 +100,16 @@ func TestUpdateCPUQuota(t *testing.T) {
// On v2, specifying CPUQuota without CPUPeriod is currently broken:
// https://github.com/opencontainers/runc/issues/2456
// As a workaround we set them together.
_, err := apiClient.ContainerUpdate(ctx, cID, containertypes.UpdateConfig{
Resources: containertypes.Resources{
_, err := apiClient.ContainerUpdate(ctx, cID, client.ContainerUpdateOptions{
Resources: &containertypes.Resources{
CPUQuota: test.update,
CPUPeriod: 100000,
},
})
assert.NilError(t, err)
} else {
_, err := apiClient.ContainerUpdate(ctx, cID, containertypes.UpdateConfig{
Resources: containertypes.Resources{
_, err := apiClient.ContainerUpdate(ctx, cID, client.ContainerUpdateOptions{
Resources: &containertypes.Resources{
CPUQuota: test.update,
},
})
@@ -185,8 +185,8 @@ func TestUpdatePidsLimit(t *testing.T) {
// Using "network=host" to speed up creation (13.96s vs 6.54s)
cID := container.Run(ctx, t, apiClient, container.WithPidsLimit(test.initial), container.WithNetworkMode("host"))
_, err := c.ContainerUpdate(ctx, cID, containertypes.UpdateConfig{
Resources: containertypes.Resources{
_, err := c.ContainerUpdate(ctx, cID, client.ContainerUpdateOptions{
Resources: &containertypes.Resources{
PidsLimit: test.update,
},
})

8
integration/container/update_test.go
View File

@@ -24,8 +24,8 @@ func TestUpdateRestartPolicy(t *testing.T) {
}
})
_, err := apiClient.ContainerUpdate(ctx, cID, containertypes.UpdateConfig{
RestartPolicy: containertypes.RestartPolicy{
_, err := apiClient.ContainerUpdate(ctx, cID, client.ContainerUpdateOptions{
RestartPolicy: &containertypes.RestartPolicy{
Name: "on-failure",
MaximumRetryCount: 5,
},
@@ -51,8 +51,8 @@ func TestUpdateRestartWithAutoRemove(t *testing.T) {
cID := container.Run(ctx, t, apiClient, container.WithAutoRemove)
_, err := apiClient.ContainerUpdate(ctx, cID, containertypes.UpdateConfig{
RestartPolicy: containertypes.RestartPolicy{
_, err := apiClient.ContainerUpdate(ctx, cID, client.ContainerUpdateOptions{
RestartPolicy: &containertypes.RestartPolicy{
Name: "always",
},
})