Improved test with CR feedback

client.go

@@ -1180,9 +1180,7 @@ func (f *File) writeToSequential(w io.Writer) (written int64, err error) {
  written += int64(m)
 
  if wErr != nil {
- if err == nil || err == io.EOF {
- err = wErr
- }
+ return written, wErr
  }
  }
 

client_integration_test.go

@@ -1249,42 +1249,55 @@ func TestClientReadSequential(t *testing.T) {
  }
 }
 
-type writerFunc func(b []byte) (int, error)
+type lastChunkErrSequentialWriter struct {
+ expected int
+ written int
+ writtenReturn int
+}
 
-func (f writerFunc) Write(b []byte) (int, error) {
- return f(b)
+func (w *lastChunkErrSequentialWriter) Write(b []byte) (int, error) {
+ chunkSize := len(b)
+ w.written += chunkSize
+ if w.written == w.expected {
+ return w.writtenReturn, errors.New("test error")
+ }
+ return chunkSize, nil
 }
 
 func TestClientWriteSequential_WriterErr(t *testing.T) {
  sftp, cmd := testClient(t, READONLY, NODELAY)
  defer cmd.Wait()
  defer sftp.Close()
 
- sftp.disableConcurrentReads = true
- d, err := ioutil.TempDir("", "sftptest-writesequential")
+ d, err := ioutil.TempDir("", "sftptest-writesequential-writeerr")
  require.NoError(t, err)
 
  defer os.RemoveAll(d)
 
- f, err := ioutil.TempFile(d, "write-sequential-test")
+ var (
+ content = []byte("hello world")
+ shortWrite = 2
+ )
+ w := lastChunkErrSequentialWriter{
+ expected: len(content),
+ writtenReturn: shortWrite,
+ }
+
+ f, err := ioutil.TempFile(d, "write-sequential-writeerr-test")
  require.NoError(t, err)
  fname := f.Name()
- content := []byte("hello world")
- f.Write(content)
- f.Close()
+ n, err := f.Write(content)
+ require.NoError(t, err)
+ require.Equal(t, n, len(content))
+ require.NoError(t, f.Close())
 
  sftpFile, err := sftp.Open(fname)
  require.NoError(t, err)
  defer sftpFile.Close()
 
- want := errors.New("error writing")
- n, got := io.Copy(writerFunc(func(b []byte) (int, error) {
- return 10, want
- }), sftpFile)
-
- require.Error(t, got)
- assert.ErrorIs(t, want, got)
- assert.Equal(t, int64(10), n)
+ gotWritten, gotErr := sftpFile.writeToSequential(&w)
+ require.NotErrorIs(t, io.EOF, gotErr)
+ require.Equal(t, int64(shortWrite), gotWritten)
 }
 
 func TestClientReadDir(t *testing.T) {