docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

add test 

Signed-off-by: Victor Vieux <victorvieux@gmail.com>
This commit is contained in:
Victor Vieux 2015-06-02 15:54:51 -07:00
parent e8e9d553a2
commit 7604d1cc30
2 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cluster/config.go
View File

@ -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

17
cluster/config_test.go
View File

@ -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")
}
}