From 7604d1cc302fde1cbf8ce702d285fd012aba340c Mon Sep 17 00:00:00 2001 From: Victor Vieux Date: Tue, 2 Jun 2015 15:54:51 -0700 Subject: [PATCH] add test Signed-off-by: Victor Vieux --- cluster/config.go | 2 +- cluster/config_test.go | 17 +++++++++++++++++ 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/cluster/config.go b/cluster/config.go index 6e617ae482..69c547a907 100644 --- a/cluster/config.go +++ b/cluster/config.go @@ -36,7 +36,7 @@ func consolidateResourceFields(c *dockerclient.ContainerConfig) { } if c.MemorySwap != c.HostConfig.MemorySwap { - if c.Memory != 0 { + if c.MemorySwap != 0 { c.HostConfig.MemorySwap = c.MemorySwap } else { c.MemorySwap = c.HostConfig.MemorySwap diff --git a/cluster/config_test.go b/cluster/config_test.go index 8d8f1d6aa6..f4452d5fc4 100644 --- a/cluster/config_test.go +++ b/cluster/config_test.go @@ -64,3 +64,20 @@ func TestAffinities(t *testing.T) { assert.Len(t, config.Affinities(), 1) assert.Equal(t, len(config.Affinities()), 1) } + +func TestConsolidateResourceFields(t *testing.T) { + for _, config := range []*ContainerConfig{ + BuildContainerConfig(dockerclient.ContainerConfig{Memory: 4242, MemorySwap: 4343, CpuShares: 4444, Cpuset: "1-2"}), + BuildContainerConfig(dockerclient.ContainerConfig{HostConfig: dockerclient.HostConfig{Memory: 4242, MemorySwap: 4343, CpuShares: 4444, CpusetCpus: "1-2"}}), + } { + assert.Equal(t, config.Memory, int64(4242)) + assert.Equal(t, config.MemorySwap, int64(4343)) + assert.Equal(t, config.CpuShares, int64(4444)) + assert.Equal(t, config.Cpuset, "1-2") + assert.Equal(t, config.HostConfig.Memory, int64(4242)) + assert.Equal(t, config.HostConfig.MemorySwap, int64(4343)) + assert.Equal(t, config.HostConfig.CpuShares, int64(4444)) + assert.Equal(t, config.HostConfig.CpusetCpus, "1-2") + } + +}