Merge pull request #5539 from alakesh/btrfs-test

dmcgowan · web-flow · commit 925ff5a21ba3 · 2021-05-26T20:30:31.000-07:00
Do not run btrfs tests if btrfs kernel module is not loaded
diff --git a/snapshots/btrfs/btrfs_test.go b/snapshots/btrfs/btrfs_test.go
@@ -19,6 +19,7 @@
 package btrfs
 
 import (
+	"bytes"
 	"context"
 	"io/ioutil"
 	"os"
@@ -44,7 +45,10 @@ func boltSnapshotter(t *testing.T) func(context.Context, string) (snapshots.Snap
 		t.Skipf("could not find mkfs.btrfs: %v", err)
 	}
 
-	// TODO: Check for btrfs in /proc/module and skip if not loaded
+	procModules, err := ioutil.ReadFile("/proc/modules")
+	if err == nil && !bytes.Contains(procModules, []byte("btrfs")) {
+		t.Skip("check for btrfs kernel module failed, skipping test")
+	}
 
 	return func(ctx context.Context, root string) (snapshots.Snapshotter, func() error, error) {
 
