From 720d3c3eea6fa96f1c97f803dfdd2c44147b99e0 Mon Sep 17 00:00:00 2001 From: Chanwit Kaewkasi Date: Sun, 19 Apr 2015 22:10:18 +0700 Subject: [PATCH] fix int overflow on non-amd64 platforms Signed-off-by: Chanwit Kaewkasi --- scheduler/strategy/binpack_test.go | 4 ++-- scheduler/strategy/spread_test.go | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/scheduler/strategy/binpack_test.go b/scheduler/strategy/binpack_test.go index 593f355ece..78df07e249 100644 --- a/scheduler/strategy/binpack_test.go +++ b/scheduler/strategy/binpack_test.go @@ -41,7 +41,7 @@ func TestPlaceEqualWeight(t *testing.T) { // add 1 container 2G on node1 config := createConfig(2, 0) assert.NoError(t, nodes[0].AddContainer(createContainer("c1", config))) - assert.Equal(t, nodes[0].UsedMemory, 2*1024*1024*1024) + assert.Equal(t, nodes[0].UsedMemory, int64(2*1024*1024*1024)) // add 2 containers 1G on node2 config = createConfig(1, 0) @@ -54,7 +54,7 @@ func TestPlaceEqualWeight(t *testing.T) { node, err := s.PlaceContainer(config, nodes) assert.NoError(t, err) assert.NoError(t, node.AddContainer(createContainer("c4", config))) - assert.Equal(t, node.UsedMemory, 3*1024*1024*1024) + assert.Equal(t, node.UsedMemory, int64(3*1024*1024*1024)) // check that the last container ended on the node with the highest number of containers assert.Equal(t, node.ID, nodes[1].ID) diff --git a/scheduler/strategy/spread_test.go b/scheduler/strategy/spread_test.go index e7be210e02..45977627d1 100644 --- a/scheduler/strategy/spread_test.go +++ b/scheduler/strategy/spread_test.go @@ -19,7 +19,7 @@ func TestSpreadPlaceEqualWeight(t *testing.T) { // add 1 container 2G on node1 config := createConfig(2, 0) assert.NoError(t, nodes[0].AddContainer(createContainer("c1", config))) - assert.Equal(t, nodes[0].UsedMemory, 2*1024*1024*1024) + assert.Equal(t, nodes[0].UsedMemory, int64(2*1024*1024*1024)) // add 2 containers 1G on node2 config = createConfig(1, 0) @@ -32,7 +32,7 @@ func TestSpreadPlaceEqualWeight(t *testing.T) { node, err := s.PlaceContainer(config, nodes) assert.NoError(t, err) assert.NoError(t, node.AddContainer(createContainer("c4", config))) - assert.Equal(t, node.UsedMemory, 3*1024*1024*1024) + assert.Equal(t, node.UsedMemory, int64(3*1024*1024*1024)) // check that the last container ended on the node with the lowest number of containers assert.Equal(t, node.ID, nodes[0].ID)