persist: fix test

Fix failing unit test Signed-off-by: Wei Zhang <[email protected]>
kata-containers · Jan 7, 2019 · e58557b · e58557b
1 parent 5717ac3
commit e58557b
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 6 deletions.
diff --git a/virtcontainers/container_test.go b/virtcontainers/container_test.go
@@ -20,6 +20,7 @@ import (
 	"github.com/kata-containers/runtime/virtcontainers/device/config"
 	"github.com/kata-containers/runtime/virtcontainers/device/drivers"
 	"github.com/kata-containers/runtime/virtcontainers/device/manager"
+	"github.com/kata-containers/runtime/virtcontainers/persist"
 	"github.com/stretchr/testify/assert"
 )
 
@@ -225,6 +226,10 @@ func TestContainerAddDriveDir(t *testing.T) {
 		},
 	}
 
+	if sandbox.store = persist.GetDriver("fs"); sandbox.store == nil {
+		t.Fatalf("failed to get fs persist driver")
+	}
+
 	contID := "100"
 	container := Container{
 		sandbox: sandbox,

diff --git a/virtcontainers/device/drivers/block.go b/virtcontainers/device/drivers/block.go
@@ -143,7 +143,7 @@ func (device *BlockDevice) GetDeviceInfo() interface{} {
 	return device.BlockDrive
 }
 
-// Persist convert and return data in persist format
+// Dump convert and return data in persist format
 func (device *BlockDevice) Dump() persistapi.DeviceState {
 	ds := device.GenericDevice.Dump()
 	ds.Type = string(device.DeviceType())

diff --git a/virtcontainers/device/drivers/generic.go b/virtcontainers/device/drivers/generic.go
@@ -129,7 +129,7 @@ func (device *GenericDevice) bumpAttachCount(attach bool) (skip bool, err error)
 	}
 }
 
-// Persist convert and return data in persist format
+// Dump convert and return data in persist format
 func (device *GenericDevice) Dump() persistapi.DeviceState {
 	info := device.DeviceInfo
 	return persistapi.DeviceState{

diff --git a/virtcontainers/device/drivers/vfio.go b/virtcontainers/device/drivers/vfio.go
@@ -130,7 +130,7 @@ func (device *VFIODevice) GetDeviceInfo() interface{} {
 	return device.VfioDevs
 }
 
-// Persist convert and return data in persist format
+// Dump convert and return data in persist format
 func (device *VFIODevice) Dump() persistapi.DeviceState {
 	ds := device.GenericDevice.Dump()
 	ds.Type = string(device.DeviceType())

diff --git a/virtcontainers/device/drivers/vhost_user_blk.go b/virtcontainers/device/drivers/vhost_user_blk.go
@@ -80,7 +80,7 @@ func (device *VhostUserBlkDevice) GetDeviceInfo() interface{} {
 	return &device.VhostUserDeviceAttrs
 }
 
-// Persist convert and return data in persist format
+// Dump convert and return data in persist format
 func (device *VhostUserBlkDevice) Dump() persistapi.DeviceState {
 	ds := device.GenericDevice.Dump()
 	ds.Type = string(device.DeviceType())

diff --git a/virtcontainers/device/drivers/vhost_user_net.go b/virtcontainers/device/drivers/vhost_user_net.go
@@ -80,7 +80,7 @@ func (device *VhostUserNetDevice) GetDeviceInfo() interface{} {
 	return &device.VhostUserDeviceAttrs
 }
 
-// Persist convert and return data in persist format
+// Dump convert and return data in persist format
 func (device *VhostUserNetDevice) Dump() persistapi.DeviceState {
 	ds := device.GenericDevice.Dump()
 	ds.Type = string(device.DeviceType())

diff --git a/virtcontainers/device/drivers/vhost_user_scsi.go b/virtcontainers/device/drivers/vhost_user_scsi.go
@@ -79,7 +79,7 @@ func (device *VhostUserSCSIDevice) GetDeviceInfo() interface{} {
 	return &device.VhostUserDeviceAttrs
 }
 
-// Persist convert and return data in persist format
+// Dump convert and return data in persist format
 func (device *VhostUserSCSIDevice) Dump() persistapi.DeviceState {
 	ds := device.GenericDevice.Dump()
 	ds.Type = string(device.DeviceType())