From d9bcc1c0bf4d339edcdabaf4d4d67b848ad8818d Mon Sep 17 00:00:00 2001
From: Nuno Cruces <ncruces@users.noreply.github.com>
Date: Wed, 12 Apr 2023 00:22:04 +0100
Subject: [PATCH] Don't use subtests.

---
 src/embed/internal/embedtest/embed_test.go | 90 +++++++++++-----------
 1 file changed, 43 insertions(+), 47 deletions(-)

diff --git a/src/embed/internal/embedtest/embed_test.go b/src/embed/internal/embedtest/embed_test.go
index 9f04b5f97c..c925942191 100644
--- a/src/embed/internal/embedtest/embed_test.go
+++ b/src/embed/internal/embedtest/embed_test.go
@@ -186,54 +186,50 @@ func TestOffset(t *testing.T) {
 
 	const want = "hello, world\n"
 
-	t.Run("Read", func(t *testing.T) {
-		got := make([]byte, len(want))
-		n, err := file.Read(got)
-		if err != nil {
-			t.Fatal("Read:", err)
-		}
-		if n != len(want) {
-			t.Fatal("Read:", n)
-		}
-		if string(got) != want {
-			t.Fatalf("Read: %q", got)
-		}
-	})
+	// Read the entire file.
+	got := make([]byte, len(want))
+	n, err := file.Read(got)
+	if err != nil {
+		t.Fatal("Read:", err)
+	}
+	if n != len(want) {
+		t.Fatal("Read:", n)
+	}
+	if string(got) != want {
+		t.Fatalf("Read: %q", got)
+	}
 
-	t.Run("EOF", func(t *testing.T) {
-		var buf [1]byte
-		n, err := file.Read(buf[:])
-		if err != io.EOF {
-			t.Fatal("Read:", err)
-		}
-		if n != 0 {
-			t.Fatal("Read:", n)
-		}
-	})
+	// Try to read one byte; confirm we're at the EOF.
+	var buf [1]byte
+	n, err = file.Read(buf[:])
+	if err != io.EOF {
+		t.Fatal("Read:", err)
+	}
+	if n != 0 {
+		t.Fatal("Read:", n)
+	}
 
-	t.Run("Offset", func(t *testing.T) {
-		seeker := file.(io.Seeker)
-		n, err := seeker.Seek(0, io.SeekCurrent)
-		if err != nil {
-			t.Fatal("Read:", err)
-		}
-		if n != int64(len(want)) {
-			t.Fatal("Read:", n)
-		}
-	})
+	// Use seek to get the offset at the EOF.
+	seeker := file.(io.Seeker)
+	off, err := seeker.Seek(0, io.SeekCurrent)
+	if err != nil {
+		t.Fatal("Seek:", err)
+	}
+	if off != int64(len(want)) {
+		t.Fatal("Seek:", off)
+	}
 
-	t.Run("ReadAt", func(t *testing.T) {
-		at := file.(io.ReaderAt)
-		got := make([]byte, len(want))
-		n, err := at.ReadAt(got, 0)
-		if err != nil {
-			t.Fatal("ReadAt:", err)
-		}
-		if n != len(want) {
-			t.Fatal("ReadAt:", n)
-		}
-		if string(got) != want {
-			t.Fatalf("ReadAt: %q", got)
-		}
-	})
+	// Use ReadAt to read the entire file, ignoring the offset.
+	at := file.(io.ReaderAt)
+	got = make([]byte, len(want))
+	n, err = at.ReadAt(got, 0)
+	if err != nil {
+		t.Fatal("ReadAt:", err)
+	}
+	if n != len(want) {
+		t.Fatal("ReadAt:", n)
+	}
+	if string(got) != want {
+		t.Fatalf("ReadAt: %q", got)
+	}
 }