add WithContext() calls to each test handler

eikenb · eikenb · commit 91a21603c963 · 2019-01-29T14:49:05.000-08:00
Want to catch issues with using Context objects in tests. Instigated by a deadlock bug (pkg#280) when calling WithContext(). This triggers that bug.
diff --git a/request-example.go b/request-example.go
@@ -26,6 +26,7 @@ func InMemHandler() Handlers {
 
 // Example Handlers
 func (fs *root) Fileread(r *Request) (io.ReaderAt, error) {
+	_ = r.WithContext(r.Context())
 	if fs.mockErr != nil {
 		return nil, fs.mockErr
 	}
@@ -45,6 +46,7 @@ func (fs *root) Fileread(r *Request) (io.ReaderAt, error) {
 }
 
 func (fs *root) Filewrite(r *Request) (io.WriterAt, error) {
+	_ = r.WithContext(r.Context())
 	if fs.mockErr != nil {
 		return nil, fs.mockErr
 	}
@@ -66,6 +68,7 @@ func (fs *root) Filewrite(r *Request) (io.WriterAt, error) {
 }
 
 func (fs *root) Filecmd(r *Request) error {
+	_ = r.WithContext(r.Context())
 	if fs.mockErr != nil {
 		return fs.mockErr
 	}
@@ -126,6 +129,7 @@ func (f listerat) ListAt(ls []os.FileInfo, offset int64) (int, error) {
 }
 
 func (fs *root) Filelist(r *Request) (ListerAt, error) {
+	_ = r.WithContext(r.Context())
 	if fs.mockErr != nil {
 		return nil, fs.mockErr
 	}
diff --git a/request_test.go b/request_test.go
@@ -22,24 +22,28 @@ func (t *testHandler) Fileread(r *Request) (io.ReaderAt, error) {
 	if t.err != nil {
 		return nil, t.err
 	}
+	_ = r.WithContext(r.Context())
 	return bytes.NewReader(t.filecontents), nil
 }
 
 func (t *testHandler) Filewrite(r *Request) (io.WriterAt, error) {
 	if t.err != nil {
 		return nil, t.err
 	}
+	_ = r.WithContext(r.Context())
 	return io.WriterAt(t.output), nil
 }
 
 func (t *testHandler) Filecmd(r *Request) error {
+	_ = r.WithContext(r.Context())
 	return t.err
 }
 
 func (t *testHandler) Filelist(r *Request) (ListerAt, error) {
 	if t.err != nil {
 		return nil, t.err
 	}
+	_ = r.WithContext(r.Context())
 	f, err := os.Open(r.Filepath)
 	if err != nil {
 		return nil, err

Original file line number	Diff line number	Diff line change
`@@ -26,6 +26,7 @@ func InMemHandler() Handlers {`
`26`	`26`
`27`	`27`	`// Example Handlers`
`28`	`28`	`func (fs root) Fileread(r Request) (io.ReaderAt, error) {`
	`29`	`+ _ = r.WithContext(r.Context())`
`29`	`30`	`if fs.mockErr != nil {`
`30`	`31`	`return nil, fs.mockErr`
`31`	`32`	`}`
`@@ -45,6 +46,7 @@ func (fs root) Fileread(r Request) (io.ReaderAt, error) {`
`45`	`46`	`}`
`46`	`47`
`47`	`48`	`func (fs root) Filewrite(r Request) (io.WriterAt, error) {`
	`49`	`+ _ = r.WithContext(r.Context())`
`48`	`50`	`if fs.mockErr != nil {`
`49`	`51`	`return nil, fs.mockErr`
`50`	`52`	`}`
`@@ -66,6 +68,7 @@ func (fs root) Filewrite(r Request) (io.WriterAt, error) {`
`66`	`68`	`}`
`67`	`69`
`68`	`70`	`func (fs root) Filecmd(r Request) error {`
	`71`	`+ _ = r.WithContext(r.Context())`
`69`	`72`	`if fs.mockErr != nil {`
`70`	`73`	`return fs.mockErr`
`71`	`74`	`}`
`@@ -126,6 +129,7 @@ func (f listerat) ListAt(ls []os.FileInfo, offset int64) (int, error) {`
`126`	`129`	`}`
`127`	`130`
`128`	`131`	`func (fs root) Filelist(r Request) (ListerAt, error) {`
	`132`	`+ _ = r.WithContext(r.Context())`
`129`	`133`	`if fs.mockErr != nil {`
`130`	`134`	`return nil, fs.mockErr`
`131`	`135`	`}`
Original file line number	Diff line number	Diff line change
`@@ -22,24 +22,28 @@ func (t testHandler) Fileread(r Request) (io.ReaderAt, error) {`
`22`	`22`	`if t.err != nil {`
`23`	`23`	`return nil, t.err`
`24`	`24`	`}`
	`25`	`+ _ = r.WithContext(r.Context())`
`25`	`26`	`return bytes.NewReader(t.filecontents), nil`
`26`	`27`	`}`
`27`	`28`
`28`	`29`	`func (t testHandler) Filewrite(r Request) (io.WriterAt, error) {`
`29`	`30`	`if t.err != nil {`
`30`	`31`	`return nil, t.err`
`31`	`32`	`}`
	`33`	`+ _ = r.WithContext(r.Context())`
`32`	`34`	`return io.WriterAt(t.output), nil`
`33`	`35`	`}`
`34`	`36`
`35`	`37`	`func (t testHandler) Filecmd(r Request) error {`
	`38`	`+ _ = r.WithContext(r.Context())`
`36`	`39`	`return t.err`
`37`	`40`	`}`
`38`	`41`
`39`	`42`	`func (t testHandler) Filelist(r Request) (ListerAt, error) {`
`40`	`43`	`if t.err != nil {`
`41`	`44`	`return nil, t.err`
`42`	`45`	`}`
	`46`	`+ _ = r.WithContext(r.Context())`
`43`	`47`	`f, err := os.Open(r.Filepath)`
`44`	`48`	`if err != nil {`
`45`	`49`	`return nil, err`