update deps and backport some fixes from main branch

This commit is contained in:
Nicola Murino
2021-09-09 19:43:00 +02:00
parent 7a9272ddfc
commit a9838d2e6d
44 changed files with 437 additions and 262 deletions

View File

@@ -12,6 +12,7 @@ import (
"time"
"github.com/eikenb/pipeat"
ftpserver "github.com/fclairamb/ftpserverlib"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
@@ -250,6 +251,7 @@ xr5cb9VBRBtB9aOKVfuRhpatAfS2Pzm2Htae9lFn7slGPUmu2hkjDw==
)
type mockFTPClientContext struct {
lastDataChannel ftpserver.DataChannel
}
func (cc mockFTPClientContext) Path() string {
@@ -294,6 +296,10 @@ func (cc mockFTPClientContext) GetLastCommand() string {
return ""
}
func (cc mockFTPClientContext) GetLastDataChannel() ftpserver.DataChannel {
return cc.lastDataChannel
}
// MockOsFs mockable OsFs
type MockOsFs struct {
vfs.Fs