Merge branch '602-fix-race-in-test' into 'main'

ashmckenzie · Patrick Bajao · ashmckenzie · commit f82854df305a · 2022-11-28T04:09:29.000Z
Use blocking reader to fix race in test Closes #602 See merge request https://gitlab.com/gitlab-org/gitlab-shell/-/merge_requests/700 Merged-by: Ash McKenzie <amckenzie@gitlab.com> Approved-by: Ash McKenzie <amckenzie@gitlab.com> Co-authored-by: Patrick Bajao <ebajao@gitlab.com>
diff --git a/internal/command/twofactorverify/twofactorverify_test.go b/internal/command/twofactorverify/twofactorverify_test.go
@@ -177,7 +177,7 @@ func TestCanceledContext(t *testing.T) {
 	cmd := &Command{
 		Config:     &config.Config{GitlabUrl: url},
 		Args:       &commandargs.Shell{GitlabKeyId: "wait_infinitely"},
-		ReadWriter: &readwriter.ReadWriter{Out: output, In: &bytes.Buffer{}},
+		ReadWriter: &readwriter.ReadWriter{Out: output, In: &blockingReader{}},
 	}
 
 	ctx, cancel := context.WithCancel(context.Background())

Original file line number	Diff line number	Diff line change
`@@ -177,7 +177,7 @@ func TestCanceledContext(t *testing.T) {`
`177`	`177`	`cmd := &Command{`
`178`	`178`	`Config: &config.Config{GitlabUrl: url},`
`179`	`179`	`Args: &commandargs.Shell{GitlabKeyId: "wait_infinitely"},`
`180`		`- ReadWriter: &readwriter.ReadWriter{Out: output, In: &bytes.Buffer{}},`
	`180`	`+ ReadWriter: &readwriter.ReadWriter{Out: output, In: &blockingReader{}},`
`181`	`181`	`}`
`182`	`182`
`183`	`183`	`ctx, cancel := context.WithCancel(context.Background())`