Merge pull request #36361 from kolyshkin/pr36326-followup

integration/TestUpdateMemory: fix false failure
Upstream-commit: e3831a62a3052472d7252049bc59835d5d7dc8bd
Component: engine
This commit is contained in:
Anusha Ragunathan
2018-02-20 16:10:59 -08:00
committed by GitHub
@@ -35,7 +35,7 @@ func TestUpdateMemory(t *testing.T) {
const (
setMemory int64 = 314572800
setMemorySwap = 524288000
setMemorySwap int64 = 524288000
)
_, err := client.ContainerUpdate(ctx, cID, containertypes.UpdateConfig{
@@ -66,7 +66,7 @@ func TestUpdateMemory(t *testing.T) {
assert.Equal(t, strconv.FormatInt(setMemorySwap, 10), strings.TrimSpace(res.Stdout()))
}
func TestUpdateCPUQUota(t *testing.T) {
func TestUpdateCPUQuota(t *testing.T) {
t.Parallel()
defer setupTest(t)()