backup return backupfile's path && fix

fix

cluster/calcium/backup.go

@@ -58,6 +58,7 @@ func (c *calcium) Backup(id, srcPath string) (*types.BackupMessage, error) {
 	file, err := os.Create(backupFile)
 	if err != nil {
 		log.Errorf("Error during create backup file %s: %v", backupFile, err)
+		return nil, err
 	}
 	defer file.Close()
 
@@ -73,5 +74,6 @@ func (c *calcium) Backup(id, srcPath string) (*types.BackupMessage, error) {
 	return &types.BackupMessage{
 		Status: "ok",
 		Size:   stat.Size,
+		Path:   backupFile,
 	}, nil
 }

cluster/calcium/backup_test.go

@@ -1,29 +1,30 @@
 package calcium
 
 import (
+	"os"
 	"testing"
 
 	"github.com/stretchr/testify/assert"
 )
 
 func TestBackup(t *testing.T) {
 	initMockConfig()
+
 	srcPath := "/tmp"
 	_, err = mockc.Backup(mockID, srcPath)
 	assert.Error(t, err)
 	assert.Equal(t, err.Error(), "BackupDir not set")
 
 	config.BackupDir = "/tmp"
 	mockc, err = New(config)
-	if err != nil {
-		t.Error(err)
-		return
-	}
+	assert.NoError(t, err)
+
 	mockc.SetStore(mockStore)
-	ch, err := mockc.Backup(mockID, srcPath)
-	if err != nil {
-		t.Error(err)
-		return
-	}
-	assert.Equal(t, ch.Status, "ok")
+	msg, err := mockc.Backup(mockID, srcPath)
+	assert.NoError(t, err)
+
+	assert.Equal(t, msg.Status, "ok")
+	t.Log("Backup to ", msg.Path)
+
+	os.RemoveAll(msg.Path)
 }

cluster/calcium/create_container_test.go

@@ -52,11 +52,9 @@ func TestCreateContainerWithMemPrior(t *testing.T) {
 	}
 
 	// Create Container with memory prior
-	testlogF("Create containers with memory prior")
+	t.Log("Create containers with memory prior")
 	createCh, err := mockc.createContainerWithMemoryPrior(specs, opts)
-	if err != nil {
-		t.Fatal(err)
-	}
+	assert.NoError(t, err)
 	ids := []string{}
 	for msg := range createCh {
 		assert.True(t, msg.Success)
@@ -78,11 +76,9 @@ func TestCreateContainerWithMemPrior(t *testing.T) {
 	mockStore.On("GetContainers", ids).Return(&cs, nil)
 
 	// Remove Container
-	testlogF("Remove containers")
+	t.Log("Remove containers")
 	removeCh, err := mockc.RemoveContainer(ids)
-	if err != nil {
-		t.Fatal(err)
-	}
+	assert.NoError(t, err)
 	for msg := range removeCh {
 		fmt.Printf("ID: %s, Message: %s\n", msg.ContainerID, msg.Message)
 		assert.True(t, msg.Success)
@@ -93,9 +89,14 @@ func TestClean(t *testing.T) {
 	initMockConfig()
 
 	// delete pod
-	if err := mockc.store.DeletePod("dev_pod", true); err != nil {
-		t.Fatal(err)
-	}
+	err := mockc.store.DeletePod(podname, false)
+	assert.Error(t, err)
+	assert.Contains(t, err.Error(), "still has nodes, delete the nodes first")
+
+	// force delete
+	err = mockc.store.DeletePod(podname, true)
+	assert.NoError(t, err)
+
 }
 
 func TestCreateContainerWithCPUPrior(t *testing.T) {
@@ -131,11 +132,9 @@ func TestCreateContainerWithCPUPrior(t *testing.T) {
 	})).Return(nil)
 
 	// Create Container with memory prior
-	testlogF("Create containers with memory prior")
+	t.Log("Create containers with memory prior")
 	createCh, err := mockc.createContainerWithCPUPrior(specs, opts)
-	if err != nil {
-		t.Fatal(err)
-	}
+	assert.NoError(t, err)
 	ids := []string{}
 	for msg := range createCh {
 		assert.True(t, msg.Success)

cluster/calcium/mock_test.go

@@ -137,7 +137,10 @@ func mockDockerDoer(r *http.Request) (*http.Response, error) {
 	case fmt.Sprintf("/containers/%s/stop", containerID):
 		testlogF("stop container %s", containerID)
 		b = []byte("body")
-	case fmt.Sprintf("/containers/%s/archive", containerID):
+	case fmt.Sprintf("/containers/%s/archive", containerID): // docker cp
+		query := r.URL.Query()
+		path := query.Get("path")
+		testlogF("mock docker cp to %s", path)
 		headercontent, err := json.Marshal(types.ContainerPathStat{
 			Name: "name",
 			Mode: 0700,
@@ -332,10 +335,11 @@ func initMockConfig() {
 
 	// GetContainer
 	rContainer := &coretypes.Container{
+		ID:       mockID,
 		Engine:   clnt,
 		Podname:  podname,
 		Nodename: nodename,
 		Name:     "hello_hi_123",
 	}
-	mockStore.On("GetContainer", mockStringType).Return(rContainer, nil)
+	mockStore.On("GetContainer", mockID).Return(rContainer, nil)
 }

cluster/calcium/network_test.go

@@ -2,16 +2,15 @@ package calcium
 
 import (
 	"testing"
+
+	"github.com/stretchr/testify/assert"
 )
 
 func TestListNetworks(t *testing.T) {
 	initMockConfig()
 
 	networks, err := mockc.ListNetworks(podname)
-	if err != nil {
-		t.Error(err)
-		return
-	}
+	assert.NoError(t, err)
 	for _, network := range networks {
 		t.Log(network.Name)
 	}

cluster/calcium/remove_container_test.go

@@ -3,21 +3,31 @@ package calcium
 import (
 	"testing"
 
+	"gitlab.ricebook.net/platform/core/types"
+
+	"github.com/docker/docker/client"
 	"github.com/stretchr/testify/assert"
 )
 
 func TestRemoveContainer(t *testing.T) {
 	initMockConfig()
 
 	ids := []string{}
+	clnt, _ := client.NewClient("http://127.0.0.1", "v1.29", mockDockerHTTPClient(), nil)
 	for i := 0; i < 5; i++ {
 		ids = append(ids, mockContainerID())
 	}
-	ch, err := mockc.RemoveContainer(ids)
-	if err != nil {
-		t.Error(err)
-		return
+	for _, id := range ids {
+		c := types.Container{
+			ID:     id,
+			Engine: clnt,
+		}
+		mockStore.On("GetContainer", id).Return(&c, nil)
 	}
+
+	ch, err := mockc.RemoveContainer(ids)
+	assert.NoError(t, err)
+
 	for c := range ch {
 		assert.True(t, c.Success)
 	}

cluster/calcium/remove_image_test.go

@@ -11,10 +11,8 @@ func TestRemoveImage(t *testing.T) {
 
 	images := []string{image}
 	ch, err := mockc.RemoveImage(podname, nodename, images)
-	if err != nil {
-		t.Error(err)
-		return
-	}
+	assert.NoError(t, err)
+
 	for c := range ch {
 		assert.True(t, c.Success)
 	}