ensure EOF after reading all files from the archive

mauri870 · mauri870 · commit ac0535790170 · 2023-07-31T08:04:48.000-03:00
diff --git a/src/archive/tar/writer_test.go b/src/archive/tar/writer_test.go
@@ -1351,9 +1351,6 @@ func TestWriterAddFs(t *testing.T) {
 
 	for name, file := range fsys {
 		hdr, err := tr.Next()
-		if err == io.EOF {
-			break // End of archive
-		}
 		if err != nil {
 			t.Fatal(err)
 		}
@@ -1374,4 +1371,10 @@ func TestWriterAddFs(t *testing.T) {
 				data, file.Data)
 		}
 	}
+
+	// check for end of archive
+	_, err := tr.Next()
+	if err != io.EOF {
+		t.Fatal("Expected end of archive, got err: ", err)
+	}
 }

Original file line number	Diff line number	Diff line change
`@@ -1351,9 +1351,6 @@ func TestWriterAddFs(t *testing.T) {`
`1351`	`1351`
`1352`	`1352`	`for name, file := range fsys {`
`1353`	`1353`	`hdr, err := tr.Next()`
`1354`		`- if err == io.EOF {`
`1355`		`- break // End of archive`
`1356`		`- }`
`1357`	`1354`	`if err != nil {`
`1358`	`1355`	`t.Fatal(err)`
`1359`	`1356`	`}`
`@@ -1374,4 +1371,10 @@ func TestWriterAddFs(t *testing.T) {`
`1374`	`1371`	`data, file.Data)`
`1375`	`1372`	`}`
`1376`	`1373`	`}`
	`1374`	`+`
	`1375`	`+ // check for end of archive`
	`1376`	`+ _, err := tr.Next()`
	`1377`	`+ if err != io.EOF {`
	`1378`	`+ t.Fatal("Expected end of archive, got err: ", err)`
	`1379`	`+ }`
`1377`	`1380`	`}`