55"bytes"
66"context"
77"encoding/json"
8+ "errors"
89"fmt"
910"io"
1011"math/rand"
@@ -324,22 +325,15 @@ func TestAgent_Session_EnvironmentVariables(t *testing.T) {
324325err = session .Start (command )
325326require .NoError (t ,err )
326327
328+ // Context is fine here since we're not doing a parallel subtest.
327329ctx := testutil .Context (t ,testutil .WaitLong )
330+ go func () {
331+ <- ctx .Done ()
332+ _ = session .Close ()
333+ }()
328334
329335s := bufio .NewScanner (stdout )
330- out := make (chan string )
331- testutil .Go (t ,func () {
332- for s .Scan () {
333- select {
334- case out <- s .Text ():
335- case <- ctx .Done ():
336- return
337- }
338- }
339- })
340336
341- // Until we have gotten the first result, the shell may spit out some data.
342- first := true
343337//nolint:paralleltest // These tests need to run sequentially.
344338for k ,partialV := range map [string ]string {
345339"CODER" :"true" ,// From the agent.
@@ -350,21 +344,17 @@ func TestAgent_Session_EnvironmentVariables(t *testing.T) {
350344} {
351345t .Run (k ,func (t * testing.T ) {
352346echoEnv (t ,stdin ,k )
353- if first {
354- for {
355- s := testutil .RequireRecvCtx (ctx ,t ,out )
356- t .Logf ("%s=%s" ,k ,s )
357- s = strings .TrimSpace (s )
358- if strings .Contains (s ,partialV ) {
359- first = false
360- return
361- }
347+ // Windows is unreliable, so keep scanning until we find a match.
348+ for s .Scan () {
349+ got := strings .TrimSpace (s .Text ())
350+ t .Logf ("%s=%s" ,k ,got )
351+ if strings .Contains (got ,partialV ) {
352+ break
362353}
363354}
364- s := testutil .RequireRecvCtx (ctx ,t ,out )
365- t .Logf ("%s=%s" ,k ,s )
366- s = strings .TrimSpace (s )
367- require .Contains (t ,s ,partialV )
355+ if err := s .Err ();! errors .Is (err ,io .EOF ) {
356+ require .NoError (t ,err )
357+ }
368358})
369359}
370360}