clearlinux/docker
2
0
Fork 0
mirror of https://github.com/clearlinux/docker.git synced 2026-09-05 21:21:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #11821 from duglin/FixCPUTest

Browse Source 
Fix TestBuildResourceConstraintsAreUsed Cpuset test
This commit is contained in:
Michael Crosby
2015-03-26 10:42:43 -07:00
parent 2bbf1987d2 389d0ae453
commit 5f295a6e82
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
integration-cli/docker_cli_build_test.go
+3 -3
View File
@@ -5524,7 +5524,7 @@ func TestBuildResourceConstraintsAreUsed(t *testing.T) {
t.Fatal(err)
}
cmd := exec.Command(dockerBinary, "build", "--rm=false", "--memory=64m", "--memory-swap=-1", "--cpuset-cpus=1", "--cpu-shares=100", "-t", name, ".")
cmd := exec.Command(dockerBinary, "build", "--rm=false", "--memory=64m", "--memory-swap=-1", "--cpuset-cpus=0", "--cpu-shares=100", "-t", name, ".")
cmd.Dir = ctx.Dir
out, _, err := runCommandWithOutput(cmd)
@@ -5555,7 +5555,7 @@ func TestBuildResourceConstraintsAreUsed(t *testing.T) {
t.Fatal(err, cfg)
}
mem := int64(c1.Memory)
if mem != 67108864 || c1.MemorySwap != -1 || c1.CpusetCpus != "1" || c1.CpuShares != 100 {
if mem != 67108864 || c1.MemorySwap != -1 || c1.CpusetCpus != "0" || c1.CpuShares != 100 {
t.Fatalf("resource constraints not set properly:\nMemory: %d, MemSwap: %d, CpusetCpus: %s, CpuShares: %d",
mem, c1.MemorySwap, c1.CpusetCpus, c1.CpuShares)
}
@@ -5574,7 +5574,7 @@ func TestBuildResourceConstraintsAreUsed(t *testing.T) {
t.Fatal(err, cfg)
}
mem = int64(c2.Memory)
if mem == 67108864 || c2.MemorySwap == -1 || c2.CpusetCpus == "1" || c2.CpuShares == 100 {
if mem == 67108864 || c2.MemorySwap == -1 || c2.CpusetCpus == "0" || c2.CpuShares == 100 {
t.Fatalf("resource constraints leaked from build:\nMemory: %d, MemSwap: %d, CpusetCpus: %s, CpuShares: %d",
mem, c2.MemorySwap, c2.CpusetCpus, c2.CpuShares)
}