Browse Source

Fix Abort semantics

Jonathan Storm 3 months ago
parent
commit
005b298cdd
2 changed files with 4 additions and 4 deletions
  1. 1 1
      v6/depager.go
  2. 3 3
      v6/depager_test.go

+ 1 - 1
v6/depager.go

@@ -180,5 +180,5 @@ func (p *pager[T]) LastErr() error {
 func (p *pager[T]) Abort() error {
 	p.cancel()
 	<-p.done
-	return p.ctx.Err()
+	return nil
 }

+ 3 - 3
v6/depager_test.go

@@ -180,7 +180,7 @@ func TestClientAbortsPagingItems(t *testing.T) {
 	for range pager.Iter() {
 		break
 	}
-	if err := pager.Abort(); err == nil {
+	if err := pager.Abort(); err != nil {
 		t.Errorf("unexpected result of Abort: %v", err)
 	}
 	if err := pager.LastErr(); err != nil {
@@ -197,7 +197,7 @@ func clearChannel(
 ) {
 }
 
-func TestClientAbortsPaging(t *testing.T) {
+func TestClientAbortsPagingPages(t *testing.T) {
 	cases := []struct{ poolLen, poolCap int }{
 		{1, 2},
 		{2, 2},
@@ -229,7 +229,7 @@ func performAbortTest(t *testing.T, poolLen, poolCap int) {
 		pagePool <- p
 		break
 	}
-	if err := pager.Abort(); err == nil {
+	if err := pager.Abort(); err != nil {
 		t.Errorf("unexpected result of Abort: %v", err)
 	}