Merge pull request firecracker-microvm#530 from kzys/test-device-file

Run TestAttachBlockDevice_Isolated's subtests in parallel

Author: kzys

internal/fsutil.go

@@ -21,13 +21,14 @@ import (
 	"os/exec"
 	"path/filepath"
 	"strings"
-	"syscall"
 	"testing"
 
 	"github.com/pkg/errors"
 	"github.com/stretchr/testify/require"
 )
 
+const mib = 1024 * 1024
+
 // CreateFSImg will create a file containing a filesystem image of the provided type containing
 // the provided files. It returns the path at which the image file can be found.
 func CreateFSImg(ctx context.Context, t *testing.T, fsType string, testFiles ...FSImgFile) string {
@@ -73,46 +74,37 @@ func createTestExtImg(ctx context.Context, t *testing.T, extName string, testFil
 	return imgFile.Name()
 }
 
-// BlockDeviceFile represents a block device
-type BlockDeviceFile struct {
-	Subpath string
-	UID     int
-	GID     int
-	Dev     int // major number
-}
-
 // CreateBlockDevice creates a block device, or block special file for testing
-func CreateBlockDevice(ctx context.Context, t *testing.T, fsType string, testFile BlockDeviceFile) string {
+func CreateBlockDevice(ctx context.Context, t *testing.T) (string, func()) {
 	t.Helper()
 
-	switch fsType {
-	case "ext4":
-		return createTestBlockDevice(ctx, t, fsType, testFile)
-	default:
-		require.FailNowf(t, "unsupported fs type %q", fsType)
-		return ""
-	}
-}
+	f, err := ioutil.TempFile("", "")
+	require.NoError(t, err)
 
-func createTestBlockDevice(ctx context.Context, t *testing.T, extName string, testFile BlockDeviceFile) string {
-	t.Helper()
+	err = f.Truncate(32 * mib)
+	require.NoError(t, err)
 
-	deviceFile := filepath.Join("/tmp/blockExample", testFile.Subpath)
-	err := os.MkdirAll(filepath.Dir(deviceFile), 0750)
-	require.NoError(t, err, "failed to mkdir for the block device")
+	out, err := exec.CommandContext(ctx, "mkfs.ext4", "-v", f.Name()).CombinedOutput()
+	require.NoErrorf(t, err, "failed to create ext img, command out:%s \n", string(out))
 
-	err = syscall.Mknod(deviceFile, syscall.S_IFBLK, testFile.Dev)
-	require.NoError(t, err, "failed to create a new block device")
+	err = f.Close()
+	require.NoError(t, err)
 
-	err = os.Chmod(deviceFile, 0600)
-	require.NoError(t, err, "failed to change file mode for the new created block device")
+	out, err = exec.CommandContext(ctx, "losetup", "--show", "--find", f.Name()).CombinedOutput()
+	require.NoError(t, err)
 
-	err = os.Chown(deviceFile, testFile.UID, testFile.GID)
-	require.NoError(t, err, "failed to grant permission to the new created block device")
+	device := strings.TrimRight(string(out), "\n")
 
-	output, err := exec.CommandContext(ctx, "mkfs."+extName, "-v", deviceFile).CombinedOutput()
-	require.NoErrorf(t, err, "failed to create ext img, command output:%s \n", string(output))
-	return deviceFile
+	err = os.Chmod(device, 0600)
+	require.NoError(t, err, "failed to change file mode for the new created block device")
+
+	return device, func() {
+		out, err := exec.CommandContext(ctx, "losetup", "--detach", device).CombinedOutput()
+		if len(out) > 0 {
+			t.Logf("losetup --detach: %s", out)
+		}
+		require.NoError(t, err)
+	}
 }
 
 // MountInfo holds data parsed from a line of /proc/mounts

runtime/jailer_integ_test.go

@@ -66,15 +66,18 @@ func TestJailer_Isolated(t *testing.T) {
 func TestAttachBlockDevice_Isolated(t *testing.T) {
 	prepareIntegTest(t)
 	t.Run("Without Jailer", func(t *testing.T) {
+		t.Parallel()
 		testAttachBlockDevice(t, nil)
 	})
 	t.Run("With Jailer", func(t *testing.T) {
+		t.Parallel()
 		testAttachBlockDevice(t, &proto.JailerConfig{
 			UID: jailerUID,
 			GID: jailerGID,
 		})
 	})
 	t.Run("With Jailer and bind-mount", func(t *testing.T) {
+		t.Parallel()
 		testAttachBlockDevice(t, &proto.JailerConfig{
 			UID:               jailerUID,
 			GID:               jailerGID,
@@ -212,28 +215,19 @@ func testAttachBlockDevice(t *testing.T, jailerConfig *proto.JailerConfig) {
 
 	vmID := testNameToVMID(t.Name())
 
-	// default BlockDeviceFile setup, will change UID & GID if a jailerConfig is passed
-	deviceFile := internal.BlockDeviceFile{
-		Subpath: "dir/block1",
-		UID:     0,
-		GID:     0,
-		Dev:     259, // 259 is the major number for blkext which is one type of block devices
-	}
+	device, cleanup := internal.CreateBlockDevice(ctx, t)
+	defer cleanup()
 
 	if jailerConfig != nil {
-		// cover "With Jailer" & "With Jailer and bind-mount" test cases
-		deviceFile.UID = int(jailerConfig.UID)
-		deviceFile.GID = int(jailerConfig.GID)
+		err := os.Chown(device, int(jailerConfig.UID), int(jailerConfig.GID))
+		require.NoError(err)
 	}
-	additionalBlockDevice := internal.CreateBlockDevice(ctx, t, "ext4", deviceFile)
-	blockExampleDir := filepath.Dir(additionalBlockDevice)
-	defer os.RemoveAll(filepath.Dir(blockExampleDir)) // clean up
 
 	request := proto.CreateVMRequest{
 		VMID:         vmID,
 		JailerConfig: jailerConfig,
 		DriveMounts: []*proto.FirecrackerDriveMount{
-			{HostPath: additionalBlockDevice, VMPath: "/home/driveMount", FilesystemType: "ext4"},
+			{HostPath: device, VMPath: "/home/driveMount", FilesystemType: "ext4"},
 		},
 	}
 
@@ -254,9 +248,8 @@ func testAttachBlockDevice(t *testing.T, jailerConfig *proto.JailerConfig) {
 
 		request.RootDrive = &proto.FirecrackerRootDrive{HostPath: dst}
 
-		// The additional drive file is only used by this test.
-		err = os.Chown(additionalBlockDevice, int(jailerConfig.UID), int(jailerConfig.GID))
-		require.NoError(err, "failed to chown %q", additionalBlockDevice)
+		err = os.Chown(device, int(jailerConfig.UID), int(jailerConfig.GID))
+		require.NoError(err, "failed to chown %q", device)
 	}
 
 	_, err = fcClient.CreateVM(ctx, &request)