fix bug in waitForError function

kinluek · Feb 7, 2020 · 6b49e86 · 6b49e86
1 parent 27f1e8b
commit 6b49e86
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 18 deletions.
diff --git a/wait.go b/wait.go
@@ -15,9 +15,6 @@ func waitForError(ctx context.Context, errChan <-chan error) error {
 			return err
 		}
 	case <-ctx.Done():
-		if err := <-errChan; err != nil {
-			return err
-		}
 		return ctx.Err()
 	}
 	return nil

diff --git a/wait_test.go b/wait_test.go
@@ -42,21 +42,6 @@ func Test_waitForError(t *testing.T) {
 			t.Fatalf("expected waitForError() to return context.Canceled, got %v", err)
 		}
 	})
-
-	t.Run("error from error channel after context cancelled", func(t *testing.T) {
-		errChan := make(chan error)
-		ctx, cancel := context.WithCancel(context.Background())
-		ErrConfirmed := errors.New("confirmed")
-		go func() {
-			cancel()
-			time.Sleep(50 * time.Millisecond)
-			errChan <- ErrConfirmed
-		}()
-		if err := waitForError(ctx, errChan); err != ErrConfirmed {
-			t.Fatalf("expected waitForError() to return ErrConfirmed, got %v", err)
-		}
-	})
-
 }
 
 func Test_waitForInterval(t *testing.T) {