Add directory size to usage calculation test

dmcgowan · dmcgowan · commit 363153d5cc30 · 2020-12-04T09:45:37.000-08:00
Signed-off-by: Derek McGowan &lt;derek@mcg.dev&gt;
diff --git a/fs/du_test.go b/fs/du_test.go
@@ -31,7 +31,7 @@ import (
 )
 
 func TestUsage(t *testing.T) {
-	align, err := getTmpAlign()
+	align, dirs, err := getTmpAlign()
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -48,7 +48,7 @@ func TestUsage(t *testing.T) {
 				fstest.CreateDir("/dir", 0755),
 				fstest.CreateRandomFile("/dir/file", 1, 5, 0644),
 			),
-			size: align(5),
+			size: dirs(2) + align(5),
 		},
 		{
 			name: "MultipleSmallFile",
@@ -57,7 +57,7 @@ func TestUsage(t *testing.T) {
 				fstest.CreateRandomFile("/dir/file1", 2, 5, 0644),
 				fstest.CreateRandomFile("/dir/file2", 3, 5, 0644),
 			),
-			size: align(5) * 2,
+			size: dirs(2) + align(5)*2,
 		},
 		{
 			name: "BiggerFiles",
@@ -67,7 +67,7 @@ func TestUsage(t *testing.T) {
 				fstest.CreateRandomFile("/dir/file2", 5, 1024, 0644),
 				fstest.CreateRandomFile("/dir/file3", 6, 50*1024, 0644),
 			),
-			size: align(5) + align(1024) + align(50*1024),
+			size: dirs(2) + align(5) + align(1024) + align(50*1024),
 		},
 	}
 	if runtime.GOOS != "windows" {
@@ -81,7 +81,7 @@ func TestUsage(t *testing.T) {
 					createSparseFile("/dir/sparse2", 9, 0644, 0, 1024*1024),
 					createSparseFile("/dir/sparse2", 10, 0644, 0, 1024*1024*1024, 1024),
 				),
-				size: align(5)*3 + align(1024),
+				size: dirs(2) + align(5)*3 + align(1024),
 			},
 			{
 				name: "Hardlinks",
@@ -90,7 +90,7 @@ func TestUsage(t *testing.T) {
 					fstest.CreateRandomFile("/dir/file1", 11, 60*1024, 0644),
 					fstest.Link("/dir/file1", "/dir/link1"),
 				),
-				size: align(60 * 1024),
+				size: dirs(2) + align(60*1024),
 			},
 			{
 				name: "HardlinkSparefile",
@@ -99,7 +99,7 @@ func TestUsage(t *testing.T) {
 					createSparseFile("/dir/file1", 10, 0644, 30*1024, 1024*1024*1024, 30*1024),
 					fstest.Link("/dir/file1", "/dir/link1"),
 				),
-				size: align(30*1024) * 2,
+				size: dirs(2) + align(30*1024)*2,
 			},
 		}...)
 	}
diff --git a/fs/du_unix_test.go b/fs/du_unix_test.go
@@ -35,19 +35,22 @@ func getBsize(root string) (int64, error) {
 	return int64(s.Bsize), nil // nolint: unconvert
 }
 
-func getTmpAlign() (func(int64) int64, error) {
+// getTmpAlign returns filesystem specific size alignment functions
+// first:  aligns filesize to file usage based on blocks
+// second: determines directory usage based on directory count (assumes small directories)
+func getTmpAlign() (func(int64) int64, func(int64) int64, error) {
 	t1, err := ioutil.TempDir("", "compute-align-")
 	if err != nil {
-		return nil, errors.Wrap(err, "failed to create temp dir")
+		return nil, nil, errors.Wrap(err, "failed to create temp dir")
 	}
 	defer os.RemoveAll(t1)
 
 	bsize, err := getBsize(t1)
 	if err != nil {
-		return nil, errors.Wrap(err, "failed to get bsize")
+		return nil, nil, errors.Wrap(err, "failed to get bsize")
 	}
 
-	return func(size int64) int64 {
+	align := func(size int64) int64 {
 		// Align to blocks
 		aligned := (size / bsize) * bsize
 
@@ -57,5 +60,17 @@ func getTmpAlign() (func(int64) int64, error) {
 		}
 
 		return aligned
-	}, nil
+	}
+
+	fi, err := os.Stat(t1)
+	if err != nil {
+		return nil, nil, errors.Wrap(err, "failed to stat directory")
+	}
+
+	dirSize := fi.Sys().(*syscall.Stat_t).Blocks * blocksUnitSize
+	dirs := func(count int64) int64 {
+		return count * dirSize
+	}
+
+	return align, dirs, nil
 }
diff --git a/fs/du_windows_test.go b/fs/du_windows_test.go
@@ -16,8 +16,10 @@
 
 package fs
 
-func getTmpAlign() (func(int64) int64, error) {
+func getTmpAlign() (func(int64) int64, func(int64) int64, error) {
 	return func(s int64) int64 {
-		return s
-	}, nil
+			return s
+		}, func(c int64) int64 {
+			return c * 4096
+		}, nil
 }
