Update unexported api calls for new functionality

jaypipes · May 27, 2022 · 0a37e8a · 0a37e8a
1 parent 0e160d1
commit 0a37e8a
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 1 deletion.
diff --git a/pkg/block/block_linux.go b/pkg/block/block_linux.go
@@ -233,7 +233,7 @@ func diskPartitions(ctx *context.Context, paths *linuxpath.Paths, disk string) [
 	if len(out) == 0 {
 		size := partitionSizeBytes(paths, disk, "")
 		mp, pt, ro := partitionInfo(paths, disk)
-		du := diskPartUUID(ctx, disk)
+		du := diskPartUUID(paths, disk, "")
 		p := &Partition{
 			Name:       disk,
 			SizeBytes:  size,

diff --git a/pkg/block/block_linux_test.go b/pkg/block/block_linux_test.go
@@ -17,6 +17,8 @@ import (
 	"reflect"
 	"testing"
 
+	"github.com/jaypipes/ghw/pkg/util"
+
 	"github.com/jaypipes/ghw/pkg/context"
 	"github.com/jaypipes/ghw/pkg/linuxpath"
 	"github.com/jaypipes/ghw/pkg/option"
@@ -195,6 +197,28 @@ func TestDiskTypes(t *testing.T) {
 	}
 }
 
+func TestDiskPartitionless(t *testing.T) {
+	if _, ok := os.LookupEnv("GHW_TESTING_SKIP_BLOCK"); ok {
+		t.Skip("Skipping block tests.")
+	}
+	baseDir, _ := ioutil.TempDir("", "test")
+	defer os.RemoveAll(baseDir)
+	ctx := context.New()
+	ctx.Chroot = baseDir
+	paths := linuxpath.New(ctx)
+
+	_ = os.MkdirAll(paths.SysBlock, 0755)
+	_ = os.MkdirAll(paths.RunUdevData, 0755)
+
+	// Emulate a disk with no partitions
+	_ = os.Mkdir(filepath.Join(paths.SysBlock, "sda"), 0755)
+	_ = ioutil.WriteFile(filepath.Join(paths.SysBlock, "sda", "dev"), []byte("259:0\n"), 0644)
+	partitions := diskPartitions(ctx, paths, "sda")
+	if len(partitions) == 0 {
+		t.Fatalf("Got no partitions but expected sda")
+	}
+}
+
 func TestDiskPartLabel(t *testing.T) {
 	if _, ok := os.LookupEnv("GHW_TESTING_SKIP_BLOCK"); ok {
 		t.Skip("Skipping block tests.")