Merge remote-tracking branch 'origin/fix-hang-on-close' into fix-hang-on-close

iamgoroot · iamgoroot · commit 53d8fbf78586 · 2024-07-24T01:36:45.000+02:00
# Conflicts:
#	writer_test.go
diff --git a/writer_test.go b/writer_test.go
@@ -193,7 +193,7 @@ func TestWriter(t *testing.T) {
 		},
 		{
 			scenario: "test no new partition writers after close",
-			function: TestWriterNoNewPartitionWritersAfterClose,
+			function: testWriterNoNewPartitionWritersAfterClose,
 		},
 	}
 
@@ -1034,7 +1034,7 @@ func testWriterOverrideConfigStats(t *testing.T) {
 	}
 }
 
-func TestWriterNoNewPartitionWritersAfterClose(t *testing.T) {
+func testWriterNoNewPartitionWritersAfterClose(t *testing.T) {
 	ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
 	defer cancel()
 	topic1 := makeTopic()

Original file line number	Diff line number	Diff line change
`@@ -193,7 +193,7 @@ func TestWriter(t *testing.T) {`
`193`	`193`	`},`
`194`	`194`	`{`
`195`	`195`	`scenario: "test no new partition writers after close",`
`196`		`- function: TestWriterNoNewPartitionWritersAfterClose,`
	`196`	`+ function: testWriterNoNewPartitionWritersAfterClose,`
`197`	`197`	`},`
`198`	`198`	`}`
`199`	`199`
`@@ -1034,7 +1034,7 @@ func testWriterOverrideConfigStats(t *testing.T) {`
`1034`	`1034`	`}`
`1035`	`1035`	`}`
`1036`	`1036`
`1037`		`-func TestWriterNoNewPartitionWritersAfterClose(t *testing.T) {`
	`1037`	`+func testWriterNoNewPartitionWritersAfterClose(t *testing.T) {`
`1038`	`1038`	`ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)`
`1039`	`1039`	`defer cancel()`
`1040`	`1040`	`topic1 := makeTopic()`