test: fix failing unit test

fix failing unit test

`newContainer` is refactored due to high cyclomatic complexity.

Signed-off-by: Wei Zhang <[email protected]>

virtcontainers/container.go

@@ -350,6 +350,17 @@ func (c *Container) SetPid(pid int) error {
 	return c.storeProcess()
 }
 
+func (c *Container) setStateBlockIndex(index int) error {
+	c.state.BlockIndex = index
+
+	err := c.sandbox.storage.storeContainerResource(c.sandbox.id, c.id, stateFileType, c.state)
+	if err != nil {
+		return err
+	}
+
+	return nil
+}
+
 func (c *Container) setStateFstype(fstype string) error {
 	c.state.Fstype = fstype
 
@@ -627,7 +638,7 @@ func newContainer(sandbox *Sandbox, contConfig ContainerConfig) (*Container, err
 	}
 
 	if err := c.Restore(); err != nil &&
-		!os.IsNotExist(err) && err != ContainerPersistNotExist {
+		!os.IsNotExist(err) && err != errContainerPersistNotExist {
 		return nil, err
 	}
 
@@ -643,6 +654,18 @@ func newContainer(sandbox *Sandbox, contConfig ContainerConfig) (*Container, err
 		c.process = process
 	}
 
+	if err = c.createMounts(); err != nil {
+		return nil, err
+	}
+
+	if err = c.createDevices(contConfig); err != nil {
+		return nil, err
+	}
+
+	return c, nil
+}
+
+func (c *Container) createMounts() error {
 	mounts, err := c.fetchMounts()
 	if err == nil {
 		// restore mounts from disk
@@ -660,7 +683,7 @@ func newContainer(sandbox *Sandbox, contConfig ContainerConfig) (*Container, err
 
 			var stat unix.Stat_t
 			if err := unix.Stat(m.Source, &stat); err != nil {
-				return nil, fmt.Errorf("stat %q failed: %v", m.Source, err)
+				return fmt.Errorf("stat %q failed: %v", m.Source, err)
 			}
 
 			// Check if mount is a block device file. If it is, the block device will be attached to the host
@@ -674,14 +697,18 @@ func newContainer(sandbox *Sandbox, contConfig ContainerConfig) (*Container, err
 					Minor:         int64(unix.Minor(stat.Rdev)),
 				})
 				if err != nil {
-					return nil, fmt.Errorf("device manager failed to create new device for %q: %v", m.Source, err)
+					return fmt.Errorf("device manager failed to create new device for %q: %v", m.Source, err)
 				}
 
 				c.mounts[i].BlockDeviceID = b.DeviceID()
 			}
 		}
 	}
 
+	return nil
+}
+
+func (c *Container) createDevices(contConfig ContainerConfig) error {
 	// Devices will be found in storage after create stage has completed.
 	// We fetch devices from storage at all other stages.
 	storedDevices, err := c.fetchDevices()
@@ -691,9 +718,9 @@ func newContainer(sandbox *Sandbox, contConfig ContainerConfig) (*Container, err
 		// If devices were not found in storage, create Device implementations
 		// from the configuration. This should happen at create.
 		for _, info := range contConfig.DeviceInfos {
-			dev, err := sandbox.devManager.NewDevice(info)
+			dev, err := c.sandbox.devManager.NewDevice(info)
 			if err != nil {
-				return &Container{}, err
+				return err
 			}
 
 			storedDevices = append(storedDevices, ContainerDevice{
@@ -704,10 +731,9 @@ func newContainer(sandbox *Sandbox, contConfig ContainerConfig) (*Container, err
 				GID:           info.GID,
 			})
 		}
-		c.devices = filterDevices(sandbox, c, storedDevices)
+		c.devices = filterDevices(c.sandbox, c, storedDevices)
 	}
-
-	return c, nil
+	return nil
 }
 
 // rollbackFailingContainerCreation rolls back important steps that might have

virtcontainers/persist.go

@@ -14,8 +14,8 @@ import (
 )
 
 var (
-	SandboxPersistNotExist   = errors.New("sandbox doesn't exist in persist data")
-	ContainerPersistNotExist = errors.New("container doesn't exist in persist data")
+	errSandboxPersistNotExist   = errors.New("sandbox doesn't exist in persist data")
+	errContainerPersistNotExist = errors.New("container doesn't exist in persist data")
 )
 
 func (s *Sandbox) dumpState(ss *persistapi.SandboxState, cs map[string]persistapi.ContainerState) error {
@@ -122,13 +122,13 @@ func (s *Sandbox) getSbxAndCntStates() (*persistapi.SandboxState, map[string]per
 		}
 
 		if len(cs) == 0 {
-			return nil, nil, SandboxPersistNotExist
+			return nil, nil, errSandboxPersistNotExist
 		}
 	}
 	return ss, cs, nil
 }
 
-// Restore will restore sandbox ata from persist file on disk
+// Restore will restore sandbox data from persist file on disk
 func (s *Sandbox) Restore() error {
 	ss, cs, err := s.getSbxAndCntStates()
 	if err != nil {
@@ -143,15 +143,15 @@ func (s *Sandbox) Restore() error {
 	return nil
 }
 
-// RestoreContainer will restore container data from persist file on disk
+// Restore will restore container data from persist file on disk
 func (c *Container) Restore() error {
 	_, cs, err := c.sandbox.getSbxAndCntStates()
 	if err != nil {
 		return err
 	}
 
 	if _, ok := cs[c.id]; !ok {
-		return ContainerPersistNotExist
+		return errContainerPersistNotExist
 	}
 
 	c.state = types.State{