@@ -2,7 +2,6 @@ package files_test
22
33import (
44"context"
5- "sync"
65"sync/atomic"
76"testing"
87"time"
@@ -35,7 +34,6 @@ func TestCancelledFetch(t *testing.T) {
3534t .Parallel ()
3635
3736fileID := uuid .New ()
38- rdy := make (chan struct {})
3937dbM := dbmock .NewMockStore (gomock .NewController (t ))
4038
4139// First call should fail
@@ -56,33 +54,17 @@ func TestCancelledFetch(t *testing.T) {
5654ctx := dbauthz .AsFileReader (testutil .Context (t ,testutil .WaitShort ))
5755cache := files .New (prometheus .NewRegistry (),& coderdtest.FakeAuthorizer {})
5856
59- var wg sync.WaitGroup
60-
6157// First call that will fail
62- wg .Add (1 )
63- go func () {
64- _ ,err := cache .Acquire (ctx ,dbM ,fileID )
65- close (rdy )
66- assert .ErrorIs (t ,err ,context .Canceled )
67- wg .Done ()
68- }()
58+ _ ,err := cache .Acquire (ctx ,dbM ,fileID )
59+ assert .ErrorIs (t ,err ,context .Canceled )
6960
7061// Second call, that should succeed
71- wg .Add (1 )
72- go func () {
73- // Wait until the first goroutine has started
74- <- rdy
75- fs ,err := cache .Acquire (ctx ,dbM ,fileID )
76- assert .NoError (t ,err )
77- if fs != nil {
78- fs .Close ()
79- }
80- wg .Done ()
81- }()
82-
83- // We need that second Acquire call to be queued up
84- time .Sleep (testutil .IntervalFast )
85- wg .Wait ()
62+ // Wait until the first goroutine has started
63+ fs ,err := cache .Acquire (ctx ,dbM ,fileID )
64+ assert .NoError (t ,err )
65+ if fs != nil {
66+ fs .Close ()
67+ }
8668}
8769
8870// nolint:paralleltest,tparallel // Serially testing is easier