@@ -63,11 +63,11 @@ func (c *fakeClient) ShowMessage(context.Context, *protocol.ShowMessageParams) e
63
63
return nil
64
64
}
65
65
66
- func setup () (context. Context , * Tracker , * fakeClient ) {
66
+ func setup () (* Tracker , * fakeClient ) {
67
67
c := & fakeClient {}
68
68
tracker := NewTracker (c )
69
69
tracker .SetSupportsWorkDoneProgress (true )
70
- return context . Background (), tracker , c
70
+ return tracker , c
71
71
}
72
72
73
73
func TestProgressTracker_Reporting (t * testing.T ) {
@@ -108,9 +108,8 @@ func TestProgressTracker_Reporting(t *testing.T) {
108
108
},
109
109
} {
110
110
t .Run (test .name , func (t * testing.T ) {
111
- ctx , tracker , client := setup ()
112
- ctx , cancel := context .WithCancel (ctx )
113
- defer cancel ()
111
+ tracker , client := setup ()
112
+ ctx := t .Context ()
114
113
tracker .supportsWorkDoneProgress = test .supported
115
114
work := tracker .Start (ctx , "work" , "message" , test .token , nil )
116
115
client .mu .Lock ()
@@ -146,10 +145,10 @@ func TestProgressTracker_Reporting(t *testing.T) {
146
145
147
146
func TestProgressTracker_Cancellation (t * testing.T ) {
148
147
for _ , token := range []protocol.ProgressToken {nil , 1 , "a" } {
149
- ctx , tracker , _ := setup ()
148
+ tracker , _ := setup ()
150
149
var canceled bool
151
150
cancel := func () { canceled = true }
152
- work := tracker .Start (ctx , "work" , "message" , token , cancel )
151
+ work := tracker .Start (t . Context () , "work" , "message" , token , cancel )
153
152
if err := tracker .Cancel (work .Token ()); err != nil {
154
153
t .Fatal (err )
155
154
}
0 commit comments