From 27dbcf00660fefb54e9874bd0ced6028989c9d98 Mon Sep 17 00:00:00 2001
From: Nicola Murino <nicola.murino@gmail.com>
Date: Sun, 12 Jan 2020 08:25:08 +0100
Subject: [PATCH] fix test cases on Windows

---
 sftpd/internal_test.go | 28 +++++++++++++++++++++-------
 sftpd/transfer.go      |  6 +++++-
 2 files changed, 26 insertions(+), 8 deletions(-)

diff --git a/sftpd/internal_test.go b/sftpd/internal_test.go
index c6df8519..7209880d 100644
--- a/sftpd/internal_test.go
+++ b/sftpd/internal_test.go
@@ -2,6 +2,7 @@ package sftpd
 
 import (
 	"bytes"
+	"errors"
 	"fmt"
 	"io"
 	"io/ioutil"
@@ -143,6 +144,10 @@ func TestUploadResumeInvalidOffset(t *testing.T) {
 	if err == nil {
 		t.Errorf("upload with invalid offset must fail")
 	}
+	err = transfer.Close()
+	if err == nil || !strings.Contains(err.Error(), "Invalid write offset") {
+		t.Errorf("unexpected error: %v", err)
+	}
 	os.Remove(testfile)
 }
 
@@ -170,7 +175,7 @@ func TestIncompleteDownload(t *testing.T) {
 		lock:           new(sync.Mutex),
 	}
 	err := transfer.Close()
-	if err == nil {
+	if err == nil || !strings.Contains(err.Error(), "incomplete download") {
 		t.Error("upoload must fail the expected size does not match")
 	}
 	os.Remove(testfile)
@@ -1155,6 +1160,7 @@ func TestSCPUploadFiledata(t *testing.T) {
 	scpCommand.connection.channel = &mockSSHChannel
 	file, _ = os.Create(testfile)
 	transfer.file = file
+	transfer.isFinished = false
 	addTransfer(&transfer)
 	err = scpCommand.getUploadFileData(2, &transfer)
 	if err == nil {
@@ -1172,6 +1178,7 @@ func TestSCPUploadFiledata(t *testing.T) {
 	scpCommand.connection.channel = &mockSSHChannel
 	file, _ = os.Create(testfile)
 	transfer.file = file
+	transfer.isFinished = false
 	addTransfer(&transfer)
 	err = scpCommand.getUploadFileData(2, &transfer)
 	if err == nil {
@@ -1187,10 +1194,13 @@ func TestSCPUploadFiledata(t *testing.T) {
 	}
 	addTransfer(&transfer)
 	err = scpCommand.getUploadFileData(0, &transfer)
-	if err == nil {
-		t.Errorf("upload must fail, the file is closed")
+	if err != errTransferClosed {
+		t.Errorf("upload must fail, the transfer is already closed")
+	}
+	err = os.Remove(testfile)
+	if err != nil {
+		t.Errorf("error removing test file: %v", err)
 	}
-	os.Remove(testfile)
 }
 
 func TestUploadError(t *testing.T) {
@@ -1223,12 +1233,16 @@ func TestUploadError(t *testing.T) {
 		lock:           new(sync.Mutex),
 	}
 	addTransfer(&transfer)
-	transfer.TransferError(fmt.Errorf("fake error"))
-	transfer.Close()
+	errFake := errors.New("fake error")
+	transfer.TransferError(errFake)
+	err := transfer.Close()
+	if err != errFake {
+		t.Errorf("unexpected error: %v", err)
+	}
 	if transfer.bytesReceived > 0 {
 		t.Errorf("bytes received should be 0 for a failed transfer: %v", transfer.bytesReceived)
 	}
-	_, err := os.Stat(testfile)
+	_, err = os.Stat(testfile)
 	if !os.IsNotExist(err) {
 		t.Errorf("file uploaded must be deleted after an error: %v", err)
 	}
diff --git a/sftpd/transfer.go b/sftpd/transfer.go
index d4b72584..40b4833e 100644
--- a/sftpd/transfer.go
+++ b/sftpd/transfer.go
@@ -18,6 +18,10 @@ const (
 	transferDownload
 )
 
+var (
+	errTransferClosed = errors.New("transfer already closed")
+)
+
 // Transfer contains the transfer details for an upload or a download.
 // It implements the io Reader and Writer interface to handle files downloads and uploads
 type Transfer struct {
@@ -99,7 +103,7 @@ func (t *Transfer) Close() error {
 	t.lock.Lock()
 	defer t.lock.Unlock()
 	if t.isFinished {
-		return errors.New("transfer already closed")
+		return errTransferClosed
 	}
 	err := t.file.Close()
 	t.isFinished = true