Close channels.

m-lab · Jul 14, 2021 · 1965aa7 · 1965aa7
1 parent 345193e
commit 1965aa7
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/internal/upload/upload.go b/internal/upload/upload.go
@@ -137,6 +137,7 @@ func Run(ctx context.Context, conn websocketx.Conn, ch chan<- spec.Measurement)
 	ctx, cancel := context.WithTimeout(ctx, params.UploadTimeout)
 	defer cancel()
 	errCh := make(chan error)
+	defer close(errCh)
 	go readcounterflow(ctx, conn, ch, errCh)
 	start := time.Now()
 	prev := start

diff --git a/internal/upload/upload_test.go b/internal/upload/upload_test.go
@@ -59,6 +59,7 @@ func TestReadMessageError(t *testing.T) {
 	}
 	ch := make(chan spec.Measurement, 128)
 	errCh := make(chan error)
+	defer close(errCh)
 	go readcounterflow(context.Background(), &conn, ch, errCh)
 	err := <-errCh
 	if err != mockedErr {
@@ -73,6 +74,7 @@ func TestReadNonTextMessageError(t *testing.T) {
 	}
 	ch := make(chan spec.Measurement, 128)
 	errCh := make(chan error)
+	defer close(errCh)
 	go readcounterflow(context.Background(), &conn, ch, errCh)
 	err := <-errCh
 	if err != errNonTextMessage {
@@ -87,6 +89,7 @@ func TestReadNonJSONError(t *testing.T) {
 	}
 	ch := make(chan spec.Measurement, 128)
 	errCh := make(chan error)
+	defer close(errCh)
 	go readcounterflow(context.Background(), &conn, ch, errCh)
 	err := <-errCh
 	var syntaxError *json.SyntaxError
@@ -109,9 +112,10 @@ func TestReadGoodMessage(t *testing.T) {
 			cancel()
 		}
 	}()
-	errs := make(chan error)
-	go readcounterflow(ctx, &conn, ch, errs)
-	err := <-errs
+	errCh := make(chan error)
+	defer close(errCh)
+	go readcounterflow(ctx, &conn, ch, errCh)
+	err := <-errCh
 	if err != nil {
 		t.Fatal(err)
 	}