fix all tests

projecteru2 · Jul 8, 2022 · afcff1a · afcff1a
1 parent 766c9b7
commit afcff1a
Show file tree

Hide file tree

Showing 6 changed files with 48 additions and 31 deletions.
diff --git a/cluster/calcium/dissociate_test.go b/cluster/calcium/dissociate_test.go
@@ -55,7 +55,8 @@ func TestDissociateWorkload(t *testing.T) {
 	rmgr.On("SetNodeResourceUsage", mock.Anything, mock.Anything, mock.Anything, mock.Anything, mock.Anything, mock.Anything, mock.Anything).Return(
 		map[string]types.NodeResourceArgs{},
 		map[string]types.NodeResourceArgs{},
-		nil)
+		nil,
+	)
 	store.On("RemoveWorkload", mock.Anything, mock.Anything).Return(types.ErrNoETCD).Once()
 	store.On("ListNodeWorkloads", mock.Anything, mock.Anything, mock.Anything).Return(nil, types.ErrNoETCD)
 	ch, err = c.DissociateWorkload(ctx, []string{"c1"})

diff --git a/cluster/calcium/node_test.go b/cluster/calcium/node_test.go
@@ -23,6 +23,8 @@ func TestAddNode(t *testing.T) {
 	ctx := context.Background()
 	factory.InitEngineCache(ctx, c.config)
 	rmgr := c.rmgr.(*resourcemocks.Manager)
+	rmgr.On("GetNodeResourceInfo", mock.Anything, mock.Anything, mock.Anything, mock.Anything, mock.Anything).Return(nil, nil, nil, nil)
+	rmgr.On("ConvertNodeResourceInfoToMetrics", mock.Anything, mock.Anything, mock.Anything, mock.Anything, mock.Anything).Return([]*resourcetypes.Metrics{}, nil)
 
 	name := "test"
 	node := &types.Node{

diff --git a/cluster/calcium/realloc_test.go b/cluster/calcium/realloc_test.go
@@ -7,6 +7,7 @@ import (
 	enginemocks "github.com/projecteru2/core/engine/mocks"
 	enginetypes "github.com/projecteru2/core/engine/types"
 	lockmocks "github.com/projecteru2/core/lock/mocks"
+	resourcetypes "github.com/projecteru2/core/resources"
 	resourcemocks "github.com/projecteru2/core/resources/mocks"
 	storemocks "github.com/projecteru2/core/store/mocks"
 	"github.com/projecteru2/core/types"
@@ -20,6 +21,8 @@ func TestRealloc(t *testing.T) {
 	ctx := context.Background()
 	store := c.store.(*storemocks.Store)
 	rmgr := c.rmgr.(*resourcemocks.Manager)
+	rmgr.On("GetNodeResourceInfo", mock.Anything, mock.Anything, mock.Anything, mock.Anything, mock.Anything).Return(nil, nil, nil, nil)
+	rmgr.On("ConvertNodeResourceInfoToMetrics", mock.Anything, mock.Anything, mock.Anything, mock.Anything, mock.Anything).Return([]*resourcetypes.Metrics{}, nil)
 	c.config.Scheduler.ShareBase = 100
 
 	lock := &lockmocks.DistributedLock{}
@@ -61,7 +64,6 @@ func TestRealloc(t *testing.T) {
 	assert.EqualError(t, err, "ETCD must be set")
 	store.AssertExpectations(t)
 	store.On("GetNode", mock.Anything, "node1").Return(node1, nil)
-	rmgr.On("GetNodeResourceInfo", mock.Anything, mock.Anything, mock.Anything, mock.Anything, mock.Anything).Return(nil, nil, nil, nil)
 
 	// failed by lock
 	store.On("CreateLock", mock.Anything, mock.Anything).Return(nil, types.ErrNoETCD).Once()

diff --git a/cluster/calcium/remove_test.go b/cluster/calcium/remove_test.go
@@ -62,7 +62,6 @@ func TestRemoveWorkload(t *testing.T) {
 			Name: "test",
 		},
 	}
-	//	plugin.On("SetNodeResourceUsage", mock.Anything, mock.Anything, mock.Anything, mock.Anything, mock.Anything, mock.Anything, mock.Anything).Return(nil, nil).Twice()
 	store.On("GetNode", mock.Anything, mock.Anything).Return(node, nil)
 	store.On("RemoveWorkload", mock.Anything, mock.Anything).Return(types.ErrNoETCD).Twice()
 	store.On("ListNodeWorkloads", mock.Anything, mock.Anything, mock.Anything).Return(nil, types.ErrNoETCD)

diff --git a/cluster/calcium/wal_test.go b/cluster/calcium/wal_test.go
@@ -9,7 +9,7 @@ import (
 	enginemocks "github.com/projecteru2/core/engine/mocks"
 	enginetypes "github.com/projecteru2/core/engine/types"
 	lockmocks "github.com/projecteru2/core/lock/mocks"
-	"github.com/projecteru2/core/resources"
+	resourcetypes "github.com/projecteru2/core/resources"
 	resourcemocks "github.com/projecteru2/core/resources/mocks"
 	storemocks "github.com/projecteru2/core/store/mocks"
 	"github.com/projecteru2/core/types"
@@ -23,6 +23,13 @@ func TestHandleCreateWorkloadNoHandle(t *testing.T) {
 	wal, err := enableWAL(c.config, c, c.store)
 	require.NoError(t, err)
 	c.wal = wal
+	rmgr := c.rmgr.(*resourcemocks.Manager)
+	rmgr.On("GetNodeResourceInfo", mock.Anything, mock.Anything, mock.Anything, mock.Anything, mock.Anything).Return(
+		map[string]types.NodeResourceArgs{},
+		map[string]types.NodeResourceArgs{},
+		[]string{},
+		nil,
+	)
 
 	wrkid := "workload-id"
 	_, err = c.wal.Log(eventWorkloadCreated, &types.Workload{ID: wrkid, Nodename: "nodename"})
@@ -48,11 +55,13 @@ func TestHandleCreateWorkloadError(t *testing.T) {
 	wal, err := enableWAL(c.config, c, c.store)
 	require.NoError(t, err)
 	c.wal = wal
-	plugin := c.rmgr.GetPlugins()[0].(*resourcemocks.Plugin)
-	plugin.On("GetNodeResourceInfo", mock.Anything, mock.Anything, mock.Anything).Return(&resources.GetNodeResourceInfoResponse{
-		ResourceInfo: &resources.NodeResourceInfo{},
-		Diffs:        []string{"hhh"},
-	}, nil)
+	rmgr := c.rmgr.(*resourcemocks.Manager)
+	rmgr.On("GetNodeResourceInfo", mock.Anything, mock.Anything, mock.Anything, mock.Anything, mock.Anything).Return(
+		map[string]types.NodeResourceArgs{},
+		map[string]types.NodeResourceArgs{},
+		[]string{},
+		nil,
+	)
 
 	engine := &enginemocks.API{}
 	node := &types.Node{
@@ -100,11 +109,13 @@ func TestHandleCreateWorkloadHandled(t *testing.T) {
 	wal, err := enableWAL(c.config, c, c.store)
 	require.NoError(t, err)
 	c.wal = wal
-	plugin := c.rmgr.GetPlugins()[0].(*resourcemocks.Plugin)
-	plugin.On("GetNodeResourceInfo", mock.Anything, mock.Anything, mock.Anything).Return(&resources.GetNodeResourceInfoResponse{
-		ResourceInfo: &resources.NodeResourceInfo{},
-		Diffs:        []string{"hhh"},
-	}, nil)
+	rmgr := c.rmgr.(*resourcemocks.Manager)
+	rmgr.On("GetNodeResourceInfo", mock.Anything, mock.Anything, mock.Anything, mock.Anything, mock.Anything).Return(
+		map[string]types.NodeResourceArgs{},
+		map[string]types.NodeResourceArgs{},
+		[]string{},
+		nil,
+	)
 
 	node := &types.Node{
 		NodeMeta: types.NodeMeta{Name: "nodename"},
@@ -145,18 +156,23 @@ func TestHandleCreateLambda(t *testing.T) {
 	wal, err := enableWAL(c.config, c, c.store)
 	require.NoError(t, err)
 	c.wal = wal
-	plugin := c.rmgr.GetPlugins()[0].(*resourcemocks.Plugin)
-	plugin.On("GetNodeResourceInfo", mock.Anything, mock.Anything, mock.Anything).Return(&resources.GetNodeResourceInfoResponse{
-		ResourceInfo: &resources.NodeResourceInfo{},
-		Diffs:        []string{"hhh"},
-	}, nil)
-	plugin.On("SetNodeResourceUsage", mock.Anything, mock.Anything, mock.Anything, mock.Anything, mock.Anything, mock.Anything, mock.Anything).Return(&resources.SetNodeResourceUsageResponse{
-		Before: types.NodeResourceArgs{},
-		After:  types.NodeResourceArgs{},
-	}, nil)
-	plugin.On("GetRemapArgs", mock.Anything, mock.Anything, mock.Anything).Return(&resources.GetRemapArgsResponse{
-		EngineArgsMap: map[string]types.EngineArgs{},
-	}, nil)
+	rmgr := c.rmgr.(*resourcemocks.Manager)
+	rmgr.On("GetNodeResourceInfo", mock.Anything, mock.Anything, mock.Anything, mock.Anything, mock.Anything).Return(
+		map[string]types.NodeResourceArgs{},
+		map[string]types.NodeResourceArgs{},
+		[]string{},
+		nil,
+	)
+	rmgr.On("SetNodeResourceUsage", mock.Anything, mock.Anything, mock.Anything, mock.Anything, mock.Anything, mock.Anything, mock.Anything).Return(
+		map[string]types.NodeResourceArgs{},
+		map[string]types.NodeResourceArgs{},
+		nil,
+	)
+	rmgr.On("ConvertNodeResourceInfoToMetrics", mock.Anything, mock.Anything, mock.Anything, mock.Anything, mock.Anything).Return([]*resourcetypes.Metrics{}, nil)
+	rmgr.On("GetRemapArgs", mock.Anything, mock.Anything, mock.Anything).Return(
+		map[string]types.EngineArgs{},
+		nil,
+	)
 
 	_, err = c.wal.Log(eventCreateLambda, "workloadid")
 	require.NoError(t, err)

diff --git a/resources/binary.go b/resources/binary.go
@@ -238,13 +238,10 @@ func (bp *BinaryPlugin) execCommand(cmd *exec.Cmd) (output, log string, err erro
 	cmd.Stdout = &stdout
 	cmd.Stderr = &stderr
 
-	err = cmd.Run()
-	output = stdout.String()
-	log = stderr.String()
-	if err != nil {
+	if err = cmd.Run(); err != nil {
 		err = fmt.Errorf("err: %v, output: %v, log: %v", err, output, log)
 	}
-	return output, log, err
+	return stdout.String(), stderr.String(), err
 }
 
 // calls the plugin and gets json response